diff -Ncwr utkernel_source.prev/config/sysdepend/app_h8s2212/utk_config_depend.h utkernel_source.curr/config/sysdepend/app_h8s2212/utk_config_depend.h *** utkernel_source.prev/config/sysdepend/app_h8s2212/utk_config_depend.h 2007-03-12 20:27:04.000000000 +0900 --- utkernel_source.curr/config/sysdepend/app_h8s2212/utk_config_depend.h 2007-09-02 11:00:39.000000000 +0900 *************** *** 13,53 **** */ /* ! * utk_config_depend.h (h8s2212) * System Configuration Definition */ /* ROMINFO */ ! #define SYSTEMAREA_TOP 0x00ffc000 /* RAM system area top */ ! #define SYSTEMAREA_END 0x00ffef00 /* RAM system area end */ /* User definition */ ! #define RI_USERAREA_TOP 0x00ffefc0 /* RAM user area top */ #define RI_USERINIT NULL /* User initialization program */ /* Stacks */ ! #define RI_INTSTACK 0x00ffefc0 /* Interrupt stack top(internal RAM end) */ /* SYSCONF */ ! #define CFN_TIMER_PERIOD 10 ! #define CFN_MAX_TSKID 32 ! #define CFN_MAX_SEMID 16 ! #define CFN_MAX_FLGID 16 ! #define CFN_MAX_MBXID 8 #define CFN_MAX_MTXID 2 ! #define CFN_MAX_MBFID 8 ! #define CFN_MAX_PORID 4 #define CFN_MAX_MPLID 2 ! #define CFN_MAX_MPFID 8 ! #define CFN_MAX_CYCID 4 ! #define CFN_MAX_ALMID 8 ! #define CFN_MAX_SSYID 4 ! #define CFN_MAX_SSYPRI 16 ! ! #define CFN_MAX_REGDEV (8) ! #define CFN_MAX_OPNDEV (16) ! #define CFN_MAX_REQDEV (16) #define CFN_DEVT_MBFSZ0 (-1) #define CFN_DEVT_MBFSZ1 (-1) --- 13,53 ---- */ /* ! * utk_config_depend.h (h83664) * System Configuration Definition */ /* ROMINFO */ ! #define SYSTEMAREA_TOP 0x0000f780 /* RAM system area top */ ! #define SYSTEMAREA_END 0x0000fec0 /* RAM system area end */ /* User definition */ ! #define RI_USERAREA_TOP 0x0000ff80 /* RAM user area top */ #define RI_USERINIT NULL /* User initialization program */ /* Stacks */ ! #define RI_INTSTACK 0x0000ff80 /* Interrupt stack top(internal RAM end) */ /* SYSCONF */ ! #define CFN_TIMER_PERIOD 250 ! #define CFN_MAX_TSKID 2 ! #define CFN_MAX_SEMID 2 ! #define CFN_MAX_FLGID 2 ! #define CFN_MAX_MBXID 2 #define CFN_MAX_MTXID 2 ! #define CFN_MAX_MBFID 2 ! #define CFN_MAX_PORID 2 #define CFN_MAX_MPLID 2 ! #define CFN_MAX_MPFID 2 ! #define CFN_MAX_CYCID 2 ! #define CFN_MAX_ALMID 2 ! #define CFN_MAX_SSYID 2 ! #define CFN_MAX_SSYPRI 2 ! ! #define CFN_MAX_REGDEV (2) ! #define CFN_MAX_OPNDEV (2) ! #define CFN_MAX_REQDEV (2) #define CFN_DEVT_MBFSZ0 (-1) #define CFN_DEVT_MBFSZ1 (-1) *************** *** 60,66 **** #define CFN_VER_PRNO3 0 #define CFN_VER_PRNO4 0 ! #define CFN_REALMEMEND ((VP)0x00ffefc0) /* * Initial task priority --- 60,66 ---- #define CFN_VER_PRNO3 0 #define CFN_VER_PRNO4 0 ! #define CFN_REALMEMEND ((VP)0xff80) /* * Initial task priority diff -Ncwr utkernel_source.prev/etc/sysdepend/app_h8s2212/makerules.sysdepend utkernel_source.curr/etc/sysdepend/app_h8s2212/makerules.sysdepend *** utkernel_source.prev/etc/sysdepend/app_h8s2212/makerules.sysdepend 2007-03-12 20:25:50.000000000 +0900 --- utkernel_source.curr/etc/sysdepend/app_h8s2212/makerules.sysdepend 2007-09-02 11:05:53.000000000 +0900 *************** *** 16,25 **** # makerules # for GNU make # ! # default rules - system-dependent (h8s2212) # # MACHINE target CPU ! # h8s2212 : H8S/2212 # # TETYPE target T-Engine type # app : T-Engine Appliance --- 16,25 ---- # makerules # for GNU make # ! # default rules - system-dependent (h83664) # # MACHINE target CPU ! # h83664 : H8/Tiny(H8/3664) # # TETYPE target T-Engine type # app : T-Engine Appliance *************** *** 39,53 **** PATH := $(PATH):/usr/local/bin:/bin:/usr/bin endif ! # ----- T-Engine Appliance H8S/2212 --------------------------------- # GCC environment TARGET_ARCH = # target type ! _CPUTYPE_FLAGS = -mrelax -ms -fomit-frame-pointer _CPUTYPE_FLAGS_AS = ! _TE_SYSTEM_NAME_ = _APP_H8S2212_ # code set _CODESET_FLAGS = --- 39,53 ---- PATH := $(PATH):/usr/local/bin:/bin:/usr/bin endif ! # ----- T-Engine Appliance H8/3664 --------------------------------- # GCC environment TARGET_ARCH = # target type ! _CPUTYPE_FLAGS = -mrelax -mh -mn -fomit-frame-pointer -Wall -Werror _CPUTYPE_FLAGS_AS = ! _TE_SYSTEM_NAME_ = _APP_H8S2212_ # XXX # code set _CODESET_FLAGS = diff -Ncwr utkernel_source.prev/include/sys/sysdepend/app_h8s2212/sysinfo_depend.h utkernel_source.curr/include/sys/sysdepend/app_h8s2212/sysinfo_depend.h *** utkernel_source.prev/include/sys/sysdepend/app_h8s2212/sysinfo_depend.h 2007-03-12 20:25:52.000000000 +0900 --- utkernel_source.curr/include/sys/sysdepend/app_h8s2212/sysinfo_depend.h 2007-09-02 13:27:02.000000000 +0900 *************** *** 13,19 **** */ /* ! * @(#)sysinfo_depend.h (sys/H8S2212) * * System common information */ --- 13,19 ---- */ /* ! * @(#)sysinfo_depend.h (sys/h83664) * * System common information */ *************** *** 30,39 **** /* * System common area info */ ! #define N_INTVEC 128 IMPORT FP knl_intvec[]; ! IMPORT W knl_taskindp; #endif /* _in_asm_source_ */ --- 30,39 ---- /* * System common area info */ ! #define N_INTVEC 26 IMPORT FP knl_intvec[]; ! IMPORT INT knl_taskindp; #endif /* _in_asm_source_ */ diff -Ncwr utkernel_source.prev/include/tk/sysdepend/app_h8s2212/asm_depend.h utkernel_source.curr/include/tk/sysdepend/app_h8s2212/asm_depend.h *** utkernel_source.prev/include/tk/sysdepend/app_h8s2212/asm_depend.h 2007-03-12 20:25:53.000000000 +0900 --- utkernel_source.curr/include/tk/sysdepend/app_h8s2212/asm_depend.h 2007-09-02 13:14:50.000000000 +0900 *************** *** 13,21 **** */ /* ! * @(#)asm_depend.h (tk/H8S2212) * ! * Assembler Macro for H8S */ #ifndef __TK_ASM_DEPEND_H__ --- 13,21 ---- */ /* ! * @(#)asm_depend.h (tk/h8300hn) * ! * Assembler Macro for h8300hn */ #ifndef __TK_ASM_DEPEND_H__ *************** *** 29,37 **** knl_inthdr_entry\vecno: stm.l (er0-er1), @-er7 // ER0, ER1 save ! mov.l #\vecno, er0 ! mov.l #Csym(knl_intvec), er1 ! mov.l @(\vecno * 4, er1), er1 jmp @er1 .endm --- 29,38 ---- knl_inthdr_entry\vecno: stm.l (er0-er1), @-er7 // ER0, ER1 save ! sub.l er0, er0 ! mov.b #\vecno, r0l ! mov.w #Csym(knl_intvec), r1 ! mov.w @(\vecno * 2, r1), r1 jmp @er1 .endm diff -Ncwr utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_init.c utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_init.c *** utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_init.c 2007-03-12 20:25:55.000000000 +0900 --- utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_init.c 2007-09-02 13:25:24.000000000 +0900 *************** *** 13,19 **** */ /* ! * cpu_init.c (H8S2212) * CPU-Dependent Initialization/Finalization */ --- 13,19 ---- */ /* ! * cpu_init.c (h8300hn) * CPU-Dependent Initialization/Finalization */ *************** *** 23,29 **** #include "tkdev_conf.h" ! EXPORT W knl_taskindp = 0; #if USE_DYNAMIC_INTHDR Noinit(EXPORT FP knl_intvec[N_INTVEC]); --- 23,29 ---- #include "tkdev_conf.h" ! EXPORT INT knl_taskindp = 0; #if USE_DYNAMIC_INTHDR Noinit(EXPORT FP knl_intvec[N_INTVEC]); diff -Ncwr utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_insn.h utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_insn.h *** utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_insn.h 2007-03-12 20:25:55.000000000 +0900 --- utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_insn.h 2007-09-02 20:55:47.000000000 +0900 *************** *** 13,20 **** */ /* ! * cpu_insn.h (H8S2212) ! * H8S2212-Dependent Operation */ #ifndef _CPU_INSN_ --- 13,20 ---- */ /* ! * cpu_insn.h (h8300hn) ! * h8300hn-Dependent Operation */ #ifndef _CPU_INSN_ *************** *** 22,28 **** #include ! IMPORT W knl_taskindp; /* ------------------------------------------------------------------------ */ /* --- 22,28 ---- #include ! IMPORT INT knl_taskindp; /* ------------------------------------------------------------------------ */ /* diff -Ncwr utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_task.h utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_task.h *** utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_task.h 2007-08-29 22:19:28.000000000 +0900 --- utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_task.h 2007-09-02 13:17:18.000000000 +0900 *************** *** 51,57 **** SStackFrame *ssp; UW ccr; ! ssp = (SStackFrame*)((UB*)(tcb->isstack) - (UB*)(sizeof(SStackFrame))); ccr = INIT_SR; --- 51,58 ---- SStackFrame *ssp; UW ccr; ! ssp = tcb->isstack; ! ssp--; ccr = INIT_SR; diff -Ncwr utkernel_source.prev/kernel/sysdepend/device/app_h8s2212/icrt0.S utkernel_source.curr/kernel/sysdepend/device/app_h8s2212/icrt0.S *** utkernel_source.prev/kernel/sysdepend/device/app_h8s2212/icrt0.S 2007-08-27 19:31:14.000000000 +0900 --- utkernel_source.curr/kernel/sysdepend/device/app_h8s2212/icrt0.S 2007-09-02 18:27:49.000000000 +0900 *************** *** 39,91 **** ldc.b #0xc0, ccr ! mov.l #__data_start, er2 /* dst address */ ! mov.l #__data_end, er3 ! cmp.l er2, er3 ble data_done /* if __data_start >= __data_end */ ! mov.l #__data_org, er1 /* src address */ data_loop: mov.l @er1+, er0 mov.l er0, @er2 add.l #4, er2 ! cmp.l er2, er3 bgt data_loop /* if er2 < __data_end */ data_done: #if USE_NOINIT ! mov.l #__noinit_end, er2 /* dst address */ #else /* .bss */ ! mov.l #__bss_start, er2 /* dst address */ #endif ! mov.l #__bss_end, er3 ! cmp.l er2, er3 ble bss_done /* if __bss_start >= __bss_end */ sub.l er0, er0 bss_loop: mov.l er0, @er2 add #4, er2 ! cmp.l er2, er3 bgt bss_loop /* if er2 < __bss_end */ bss_done: #if USE_IMALLOC ! mov.l #SYSTEMAREA_TOP, er5 ! cmp.l er5, er3 /* _end or RAM_TOP */ bge no_mov /* if er5 <= er3 */ ! mov.l er5, er3 no_mov: mov.w r3, @Csym(knl_lowmem_top) /* knl_lowmem_top = _end or RAM_TOP */ ! mov.l #SYSTEMAREA_END, er3 mov.w r3, @Csym(knl_lowmem_limit) /* knl_lowmem_limit = RAM_END */ #endif --- 39,91 ---- ldc.b #0xc0, ccr ! mov.w #__data_start, r2 /* dst address */ ! mov.w #__data_end, r3 ! cmp.w r2, r3 ble data_done /* if __data_start >= __data_end */ ! mov.w #__data_org, r1 /* src address */ data_loop: mov.l @er1+, er0 mov.l er0, @er2 add.l #4, er2 ! cmp.w r2, r3 bgt data_loop /* if er2 < __data_end */ data_done: #if USE_NOINIT ! mov.w #__noinit_end, r2 /* dst address */ #else /* .bss */ ! mov.w #__bss_start, r2 /* dst address */ #endif ! mov.w #__bss_end, r3 ! cmp.w r2, r3 ble bss_done /* if __bss_start >= __bss_end */ sub.l er0, er0 bss_loop: mov.l er0, @er2 add #4, er2 ! cmp.w r2, r3 bgt bss_loop /* if er2 < __bss_end */ bss_done: #if USE_IMALLOC ! mov.w #SYSTEMAREA_TOP, r5 ! cmp.w r5, r3 /* _end or RAM_TOP */ bge no_mov /* if er5 <= er3 */ ! mov.w r5, r3 no_mov: mov.w r3, @Csym(knl_lowmem_top) /* knl_lowmem_top = _end or RAM_TOP */ ! mov.w #SYSTEMAREA_END, r3 mov.w r3, @Csym(knl_lowmem_limit) /* knl_lowmem_limit = RAM_END */ #endif