Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/aarch64/aarch64 use c comments instead of #, consis...



details:   https://anonhg.NetBSD.org/src/rev/5c4aca7952c9
branches:  trunk
changeset: 320717:5c4aca7952c9
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 17 00:32:28 2018 +0000

description:
use c comments instead of #, consistently

diffstat:

 sys/arch/aarch64/aarch64/locore.S |  44 ++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 21 deletions(-)

diffs (100 lines):

diff -r c3322932c0ed -r 5c4aca7952c9 sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Tue Jul 17 00:31:46 2018 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Tue Jul 17 00:32:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.10 2018/07/10 08:35:58 ryo Exp $  */
+/*     $NetBSD: locore.S,v 1.11 2018/07/17 00:32:28 christos Exp $     */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -36,7 +36,7 @@
 #include <aarch64/pte.h>
 #include "assym.h"
 
-RCSID("$NetBSD: locore.S,v 1.10 2018/07/10 08:35:58 ryo Exp $")
+RCSID("$NetBSD: locore.S,v 1.11 2018/07/17 00:32:28 christos Exp $")
 
 /* #define DEBUG_LOCORE */
 /* #define DEBUG_MMU */
@@ -181,7 +181,7 @@
        VERBOSE("OK\r\n")
 
        /* set exception vector */
-       ldr     x2, =el1_vectors        # el1_vectors is in kva
+       ldr     x2, =el1_vectors        /* el1_vectors is in kva */
        msr     vbar_el1, x2
 
 #ifdef DEBUG_LOCORE
@@ -194,12 +194,12 @@
        bl      print_x0
 
        PRINT("VSTART          = ")
-       ldr     x0, =vstart     # virtual address of vstart
+       ldr     x0, =vstart     /* virtual address of vstart */
        bl      print_x0
 #endif
 
-       ldr     x0, =vstart     # virtual address of vstart
-       br      x0              # jump to the kernel virtual address
+       ldr     x0, =vstart     /* virtual address of vstart */
+       br      x0              /* jump to the kernel virtual address */
 
 /*
  * vstart is in kernel virtual address
@@ -221,8 +221,10 @@
        msr     tpidr_el1, x0           /* curcpu is cpu_info[0] */
 
        mov     fp, #0                  /* trace back starts here */
+       PRINT("initarm\r\n")
        bl      _C_LABEL(initarm)       /* Off we go */
 
+       PRINT("main\r\n")
        bl      _C_LABEL(main)          /* call main() */
 
        adr     x0, .Lmainreturned
@@ -247,30 +249,30 @@
        stp     x0, lr, [sp, #-16]!
        stp     x25, x26, [sp, #-16]!
        PRINT("[CPU")
-       mov     x26, x27                # n = cpuid
-       mov     x25, xzr                # zeropad = 0
+       mov     x26, x27                /* n = cpuid */
+       mov     x25, xzr                /* zeropad = 0 */
        mov     x1, #1000
-       udiv    x0, x26, x1             # x0 = n / 1000
-       msub    x26, x0, x1, x26        # n %= 1000
-       cbz     x0, 1f                  # if (x0 == 0) goto 1f
+       udiv    x0, x26, x1             /* x0 = n / 1000 */
+       msub    x26, x0, x1, x26        /* n %= 1000 */
+       cbz     x0, 1f                  /* if (x0 == 0) goto 1f */
        add     x0, x0, #'0'
        bl      uartputc
-       mov     x25, #1                 # zeropad = 1
+       mov     x25, #1                 /* zeropad = 1 */
 1:
        mov     x1, #100
-       udiv    x0, x26, x1             # x0 = n / 100
-       msub    x26, x0, x1, x26        # n %= 100
-       adds    x25, x25, x0            # if ((zeropad + x0) == 0)
-       beq     1f                      #   goto 1f
+       udiv    x0, x26, x1             /* x0 = n / 100 */
+       msub    x26, x0, x1, x26        /* n %= 100 */
+       adds    x25, x25, x0            /* if ((zeropad + x0) == 0) */
+       beq     1f                      /*   goto 1f */
        add     x0, x0, #'0'
        bl      uartputc
-       mov     x25, #1                 # zeropad = 1
+       mov     x25, #1                 /* zeropad = 1 */
 1:
        mov     x1, #10
-       udiv    x0, x26, x1             # x0 = n / 10
-       msub    x26, x0, x1, x26        # n %= 10
-       adds    x25, x25, x0            # if ((zeropad + x0) == 0)
-       beq     1f                      #   goto 1f
+       udiv    x0, x26, x1             /* x0 = n / 10 */
+       msub    x26, x0, x1, x26        /* n %= 10 */
+       adds    x25, x25, x0            /* if ((zeropad + x0) == 0) */
+       beq     1f                      /*   goto 1f */
        add     x0, x0, #'0'
        bl      uartputc
 1:



Home | Main Index | Thread Index | Old Index