fixed a compile error while using scons+iar for m16c

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1740 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
dzzxzz 2011-10-07 03:00:12 +00:00
parent 130da0f1d9
commit e97c87d6a0
2 changed files with 6 additions and 21 deletions

View File

@ -12,11 +12,14 @@ env = Environment(tools = ['mingw'],
AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS, CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
AR = rtconfig.AR, ARFLAGS = '-rc', AR = rtconfig.AR, ARFLAGS = '-rc',
LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'],
LINKCOM = ['$LINK $SOURCES $LINKFLAGS -f lnkm30627fhp.xcl -l rtt2m16c.map -o rtt2m16c.d34 -Omotorola-s28=$TARGET'])
env.PrependENVPath('PATH', rtconfig.EXEC_PATH) env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -f lnkm30627fhp.xcl -l rtt2m16c.map -o rtt2m16c.d34 -Omotorola-s28=$TARGET'])
env.Replace(ARFLAGS = '')
Export('RTT_ROOT') Export('RTT_ROOT')
Export('rtconfig') Export('rtconfig')

View File

@ -23,15 +23,12 @@
RSEG CODE(1) RSEG CODE(1)
EXTERN rt_thread_switch_interrupt_flag
EXTERN rt_interrupt_from_thread EXTERN rt_interrupt_from_thread
EXTERN rt_interrupt_to_thread EXTERN rt_interrupt_to_thread
PUBLIC rt_hw_interrupt_disable PUBLIC rt_hw_interrupt_disable
PUBLIC rt_hw_interrupt_enable PUBLIC rt_hw_interrupt_enable
PUBLIC rt_hw_context_switch_to PUBLIC rt_hw_context_switch_to
PUBLIC rt_hw_context_switch
PUBLIC rt_hw_context_switch_interrupt
PUBLIC os_context_switch PUBLIC os_context_switch
rt_hw_interrupt_disable: rt_hw_interrupt_disable:
@ -66,19 +63,4 @@ rt_hw_context_switch_to:
POPM R0,R1,R2,R3,A0,A1,SB,FB POPM R0,R1,R2,R3,A0,A1,SB,FB
REIT REIT
rt_hw_context_switch:
MOV.W R0, rt_interrupt_from_thread
MOV.W R1, rt_interrupt_to_thread
INT #0 ;software interrupt 0
RTS
rt_hw_context_switch_interrupt:
CMP.W #1, rt_thread_switch_interrupt_flag
JEQ jump
MOV.W #1, rt_thread_switch_interrupt_flag
MOV.W R0, rt_interrupt_from_thread
jump
MOV.W R1, rt_interrupt_to_thread
RTS
END END