Mercurial > ecos

diff packages/hal/sh/arch/current/src/vectors.S @ 139:79d72068f491 ecos-sw-2000-11-24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from eCos master repository on 2000-11-24-16:52:55-GMT
author jlarmour
date Fri, 24 Nov 2000 17:42:47 +0000
parents 289bf90c6a9b
children 2e9a636d9de9
line wrap: on
line diff
--- a/packages/hal/sh/arch/current/src/vectors.S
+++ b/packages/hal/sh/arch/current/src/vectors.S
@@ -93,10 +93,10 @@ FUNC_START(_reset)
         .align   2
 $_reset_platform:
 #ifdef CYG_HAL_STARTUP_RAM
-        .long   CYG_LABEL_NAME(_reset_platform)
+        .long   CYG_LABEL_DEFN(_reset_platform)
 #else
         // Uncached "shadow" address
-        .long   CYG_LABEL_NAME(_reset_platform)+0x20000000
+        .long   CYG_LABEL_DEFN(_reset_platform)+0x20000000
 #endif
                 
 #---------------------------------------------------------------------------
@@ -281,7 +281,7 @@ 1:
 
         .align   2
 $hal_vsr_table_int:
-        .long    CYG_LABEL_NAME(hal_vsr_table)+CYGNUM_HAL_VECTOR_INTERRUPT*4
+        .long    CYG_LABEL_DEFN(hal_vsr_table)+CYGNUM_HAL_VECTOR_INTERRUPT*4
 
 #---------------------------------------------------------------------------
 # Common interrupt handling code.
@@ -614,8 +614,12 @@ FUNC_START(hal_interrupt_stack_call_pend
         
 #ifdef CYGFUN_HAL_COMMON_KERNEL_SUPPORT
         SYM_PTR_REF(cyg_interrupt_call_pending_DSRs)
-        SYM_PTR_REF(cyg_scheduler_sched_lock)
         SYM_PTR_REF(interrupt_end)
+        # cyg_scheduler_sched_lock is special as it is defined as an asm alias
+        
+        .globl cyg_scheduler_sched_lock
+$cyg_scheduler_sched_lock:	.long	cyg_scheduler_sched_lock
+        
 #endif
 
 #---------------------------------------------------------------------------
@@ -704,7 +708,7 @@ 1:      mov.l   @r0+,r3                 
 #else
 
         # Jump to remaining setup code. Relative branch is OK since VMA=LMA.
-        bra   CYG_LABEL_NAME(complete_setup)
+        bra   CYG_LABEL_DEFN(complete_setup)
          nop
                 
 #endif
@@ -806,7 +810,7 @@ 9:
 
         .data
 
-        .extern CYG_LABEL_NAME(hal_default_isr)
+        .extern CYG_LABEL_DEFN(hal_default_isr)
 #ifdef CYGIMP_HAL_COMMON_INTERRUPTS_CHAIN
 #define CYG_ISR_TABLE_SIZE    1
 #else
@@ -815,7 +819,7 @@ 9:
 
 SYM_DEF(hal_interrupt_handlers)
         .rept   CYG_ISR_TABLE_SIZE
-        .long   CYG_LABEL_NAME(hal_default_isr)
+        .long   CYG_LABEL_DEFN(hal_default_isr)
         .endr
 
 SYM_DEF(hal_interrupt_data)