Index: aki3068net/current/cdl/hal_h8300_h8300h_aki3068net.cdl =================================================================== RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/aki3068net/current/cdl/hal_h8300_h8300h_aki3068net.cdl,v retrieving revision 1.13 diff -u -r1.13 hal_h8300_h8300h_aki3068net.cdl --- aki3068net/current/cdl/hal_h8300_h8300h_aki3068net.cdl 19 Dec 2003 07:57:32 -0000 1.13 +++ aki3068net/current/cdl/hal_h8300_h8300h_aki3068net.cdl 24 Feb 2004 11:50:52 -0000 @@ -204,7 +204,7 @@ display "Global linker flags" flavor data no_define - default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -mh -mint32" } + default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -Wl,-relax -mh -mint32" } description " This option controls the global linker flags. Individual packages may define options which override these global flags." @@ -299,14 +299,6 @@ ROM monitor may process exceptions or interrupts generated from the application. This enables features such as utilizing a separate interrupt stack when exceptions are generated." - } - cdl_option CYGSEM_HAL_H8300_VECTOR_HOOK { - display "Interrupt Vector Hook" - flavor bool - default_value 1 - parent CYGPKG_HAL_ROM_MONITOR - description " - Interrupt Vector Table Hooking Support" } cdl_option CYGHWR_HAL_H8300_VECTOR_ADDRESS { display "Hook Vector Address" Index: arch/current/ChangeLog =================================================================== RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/arch/current/ChangeLog,v retrieving revision 1.4 diff -u -r1.4 ChangeLog --- arch/current/ChangeLog 28 Nov 2003 15:34:06 -0000 1.4 +++ arch/current/ChangeLog 24 Feb 2004 11:50:52 -0000 @@ -1,3 +1,20 @@ +2004-02-24 Yoshinori Sato + + * src/vectors.S + add CYGSEM_HAL_SAVE_STUB_VECTOR. + saved parent gdb-stub breakpoint vector. + * cdl/hal_h8300.cdl + add CYGSEM_HAL_SAVE_STUB_VECTOR + move CYGSEM_HAL_H8300_VECTOR_HOOK from target cdl's + * cdl/hal_h8300_h8300h_aki3068net.cdl + * cdl/hal_h8300_h8300h_h8max.cdl + * cdl/hal_h8300_h8s_edosk2674.cdl + add Linker flags "-relax" + move CYGSEM_HAL_H8300_VECTOR_HOOK to hal_h8300.cdl + * cdl/hal_h8300_h8300h_sim.cdl + * cdl/hal_h8300_h8s_sim.cdl + add Linker flags "-relax" + 2003-07-10 Nick Garnett * : Added Yoshinori Sato's changes, see following Index: arch/current/cdl/hal_h8300.cdl =================================================================== RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/arch/current/cdl/hal_h8300.cdl,v retrieving revision 1.6 diff -u -r1.6 hal_h8300.cdl --- arch/current/cdl/hal_h8300.cdl 19 Dec 2003 07:55:44 -0000 1.6 +++ arch/current/cdl/hal_h8300.cdl 24 Feb 2004 11:50:52 -0000 @@ -119,4 +119,21 @@ legal_values { 4800 9600 14400 19200 38400 57600 115200 } default_value { 38400 } } + cdl_option CYGSEM_HAL_H8300_VECTOR_HOOK { + display "Interrupt Vector Hook" + flavor bool + default_value 1 + parent CYGPKG_HAL_ROM_MONITOR + description " + Interrupt Vector Table Hooking Support" + } + cdl_option CYGSEM_HAL_H8300_SAVE_STUB_VECTOR { + display "Save gdb-stub breakpoint vector" + flavor bool + default_value 0 + parent CYGPKG_HAL_ROM_MONITOR + description " + Do not change vector of the breakpoint exception that + gdb-stub uses" + } } Index: arch/current/src/vectors.S =================================================================== RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/arch/current/src/vectors.S,v retrieving revision 1.13 diff -u -r1.13 vectors.S --- arch/current/src/vectors.S 8 Dec 2003 16:55:48 -0000 1.13 +++ arch/current/src/vectors.S 24 Feb 2004 11:50:53 -0000 @@ -292,6 +292,10 @@ mov.l @8*4,er0 and.w #0xff,e0 sub.l #8*4,er0 +#if defined(CYGSEM_HAL_H8300_SAVE_STUB_VECTOR) + ;; save breakpoint vector + mov.l @(11*4,er0),er3 +#endif ;; build ram vector mov.l er0,@__interrupt_table mov.l #0x5e000000+interrupt_entry,er1 @@ -304,7 +308,12 @@ bra 4f 3: bra 3b -4: +4: +#if defined(CYGSEM_HAL_H8300_SAVE_STUB_VECTOR) + ;; restore breakpoint vector + mov.l er3,@(11*4,er0) +#endif + #else mov.l #interrupt_redirect_table,er0 mov.l er0,@__interrupt_table Index: edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl =================================================================== RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl,v retrieving revision 1.7 diff -u -r1.7 hal_h8300_h8s_edosk2674.cdl --- edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl 19 Dec 2003 07:57:56 -0000 1.7 +++ edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl 24 Feb 2004 11:50:53 -0000 @@ -191,7 +191,7 @@ display "Global linker flags" flavor data no_define - default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -ms -mint32" } + default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -Wl,-relax -ms -mint32" } description " This option controls the global linker flags. Individual packages may define options which override these global flags." @@ -256,14 +256,6 @@ ROM monitor may process exceptions or interrupts generated from the application. This enables features such as utilizing a separate interrupt stack when exceptions are generated." - } - cdl_option CYGSEM_HAL_H8300_VECTOR_HOOK { - display "Interrupt Vector Hook" - flavor bool - default_value 1 - parent CYGPKG_HAL_ROM_MONITOR - description " - Interrupt Vector Table Hooking Support" } cdl_option CYGHWR_HAL_H8300_VECTOR_ADDRESS { display "Hook Vector Address" Index: h8max/current/cdl/hal_h8300_h8300h_h8max.cdl =================================================================== RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/h8max/current/cdl/hal_h8300_h8300h_h8max.cdl,v retrieving revision 1.8 diff -u -r1.8 hal_h8300_h8300h_h8max.cdl --- h8max/current/cdl/hal_h8300_h8300h_h8max.cdl 19 Dec 2003 07:57:32 -0000 1.8 +++ h8max/current/cdl/hal_h8300_h8300h_h8max.cdl 24 Feb 2004 11:50:54 -0000 @@ -199,7 +199,7 @@ display "Global linker flags" flavor data no_define - default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -mh -mint32" } + default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -Wl,-relax -mh -mint32" } description " This option controls the global linker flags. Individual packages may define options which override these global flags." @@ -264,14 +264,6 @@ ROM monitor may process exceptions or interrupts generated from the application. This enables features such as utilizing a separate interrupt stack when exceptions are generated." - } - cdl_option CYGSEM_HAL_H8300_VECTOR_HOOK { - display "Interrupt Vector Hook" - flavor bool - default_value 1 - parent CYGPKG_HAL_ROM_MONITOR - description " - Interrupt Vector Table Hooking Support" } cdl_option CYGHWR_HAL_H8300_VECTOR_ADDRESS { display "Hook Vector Address" Index: sim/current/cdl/hal_h8300_h8300h_sim.cdl =================================================================== RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/sim/current/cdl/hal_h8300_h8300h_sim.cdl,v retrieving revision 1.7 diff -u -r1.7 hal_h8300_h8300h_sim.cdl --- sim/current/cdl/hal_h8300_h8300h_sim.cdl 28 Jul 2003 11:27:28 -0000 1.7 +++ sim/current/cdl/hal_h8300_h8300h_sim.cdl 24 Feb 2004 11:50:55 -0000 @@ -173,7 +173,7 @@ display "Global linker flags" flavor data no_define - default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -mh -mint32" } + default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -Wl,-relax -mh -mint32" } description " This option controls the global linker flags. Individual packages may define options which override these global flags." Index: sim_s/current/cdl/hal_h8300_h8s_sim.cdl =================================================================== RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/sim_s/current/cdl/hal_h8300_h8s_sim.cdl,v retrieving revision 1.2 diff -u -r1.2 hal_h8300_h8s_sim.cdl --- sim_s/current/cdl/hal_h8300_h8s_sim.cdl 8 Mar 2003 16:17:25 -0000 1.2 +++ sim_s/current/cdl/hal_h8300_h8s_sim.cdl 24 Feb 2004 11:50:55 -0000 @@ -173,7 +173,7 @@ display "Global linker flags" flavor data no_define - default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -ms -mint32" } + default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -Wl,-relax -ms -mint32" } description " This option controls the global linker flags. Individual packages may define options which override these global flags."