Changes in boot/arch/sparc64/src/asm.S [a52e2f4:9d58539] in mainline

File:

• boot/arch/sparc64/src/asm.S (modified) (6 diffs)

boot/arch/sparc64/src/asm.S

@@ -28 +28 @@
 #
 
-#include <abi/asmtool.h>
 #include <arch/arch.h>
 
-#if defined(PROCESSOR_us) || defined(PROCESSOR_us3)
 #define ICACHE_SIZE       8192
 #define ICACHE_LINE_SIZE  32
 #define ICACHE_SET_BIT    (1 << 13)
 #define ASI_ICACHE_TAG    0x67
-#endif  /* PROCESSOR_us || PROCESSOR_us3 */
 
 .register %g2, #scratch
@@ -43 +40 @@
 .register %g7, #scratch
 
+.global start
+.global halt
+.global jump_to_kernel
+
 .section BOOTSTRAP, "ax"
 
-SYMBOL(start)
+start:
         ba %xcc, 1f
         nop
@@ -93 +94 @@
 .text
 
-FUNCTION_BEGIN(halt)
+halt:
         ba %xcc, halt
         nop
-FUNCTION_END(halt)
 
-FUNCTION_BEGIN(jump_to_kernel)
+jump_to_kernel:
         /*
          * Guarantee cache coherence:
@@ -131 +131 @@
         jmp %o3
         nop
-FUNCTION_END(jump_to_kernel)
 
 # Flush I-cache
 icache_flush:
-#if defined(PROCESSOR_us) || defined(PROCESSOR_us3)
         set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
         stxa %g0, [%g1] ASI_ICACHE_TAG
@@ -151 +149 @@
         
         nop
-#else
-        // TODO: sun4v
-        retl
-        nop
-#endif  /* PROCESSOR_us || PROCESSOR_us3 */
 
-FUNCTION_BEGIN(ofw)
+.global ofw
+ofw:
         save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
         set ofw_cif, %l0
@@ -173 +167 @@
         ret
         restore %o0, 0, %o0
-FUNCTION_END(ofw)