From 0903597f4f631705c40b5dc9fbdcc2c3e9c0c936 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 18 Apr 1998 17:26:41 +0000 Subject: psim now runs in both debug and non-debug mode. --- c/src/lib/libbsp/powerpc/psim/bsp_specs | 10 +++++----- c/src/lib/libbsp/powerpc/psim/console/console.c | 6 ++++++ c/src/lib/libbsp/powerpc/psim/startup/bspstart.c | 7 +++---- c/src/lib/libbsp/powerpc/psim/startup/linkcmds | 3 +++ 4 files changed, 17 insertions(+), 9 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/psim') diff --git a/c/src/lib/libbsp/powerpc/psim/bsp_specs b/c/src/lib/libbsp/powerpc/psim/bsp_specs index 54aadccfff..a28e9237f5 100644 --- a/c/src/lib/libbsp/powerpc/psim/bsp_specs +++ b/c/src/lib/libbsp/powerpc/psim/bsp_specs @@ -8,15 +8,15 @@ %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded) *lib: -%{!qrtems: %(old_lib)} %{qrtems: ecrti%O%s --start-group \ +%{!qrtems: %(old_lib)} %{qrtems: --start-group \ %{!qrtems_debug: -lrtemsall} %{qrtems_debug: -lrtemsall_g} \ --lc -lgcc --end-group \ +-lc -lgcc --end-group ecrtn%O%s \ %{!qnolinkcmds: -T linkcmds%s}} *startfile: -%{!qrtems: %(old_startfile)} %{qrtems: startsim.o%s \ -%{!qrtems_debug: } \ -%{qrtems_debug: }} +%{!qrtems: %(old_startfile)} %{qrtems: ecrti%O%s \ +%{!qrtems_debug: startsim.o%s} \ +%{qrtems_debug: startsim_g.o%s}} *link: %{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -T linkcmds%s -e _start -u __vectors} diff --git a/c/src/lib/libbsp/powerpc/psim/console/console.c b/c/src/lib/libbsp/powerpc/psim/console/console.c index a4a9e7175e..19b695f65c 100644 --- a/c/src/lib/libbsp/powerpc/psim/console/console.c +++ b/c/src/lib/libbsp/powerpc/psim/console/console.c @@ -182,3 +182,9 @@ rtems_device_driver console_control( return rtems_termios_ioctl (arg); } +void console_reserve_resources( + rtems_configuration_table *configuration +) +{ + rtems_termios_reserve_resources( configuration, 1 ); +} diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c index 8b68345c8c..983919a20c 100644 --- a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c @@ -214,6 +214,7 @@ void bsp_start( void ) BSP_Configuration.work_space_size *= 3; #endif + BSP_Configuration.work_space_size += 32 * 1024; #if 0 work_space_start = @@ -230,13 +231,11 @@ void bsp_start( void ) BSP_Configuration.work_space_start = work_space_start; -#ifdef STACK_CHECKER_ON /* - * Add 1 extension for stack checker + * Account for the console's resources */ - BSP_Configuration.maximum_extensions++; -#endif + console_reserve_resources( &BSP_Configuration ); #if PSIM_FAST_IDLE /* diff --git a/c/src/lib/libbsp/powerpc/psim/startup/linkcmds b/c/src/lib/libbsp/powerpc/psim/startup/linkcmds index c43cbee273..1f3c17507e 100644 --- a/c/src/lib/libbsp/powerpc/psim/startup/linkcmds +++ b/c/src/lib/libbsp/powerpc/psim/startup/linkcmds @@ -104,6 +104,7 @@ SECTIONS /* Put .ctors and .dtors next to the .got2 section, so that the pointers get relocated with -mrelocatable. Also put in the .fixup pointers. The current compiler no longer needs this, but keep it around for 2.7.2 */ + PROVIDE (__GOT2_START__ = .); PROVIDE (_GOT2_START_ = .); .got2 : { *(.got2) } PROVIDE (__GOT2_END__ = .); @@ -113,11 +114,13 @@ SECTIONS PROVIDE (__DTOR_LIST__ = .); .dtors : { *(.dtors) } PROVIDE (__DTOR_END__ = .); + PROVIDE (__FIXUP_START__ = .); PROVIDE (_FIXUP_START_ = .); .fixup : { *(.fixup) } PROVIDE (_FIXUP_END_ = .); PROVIDE (__FIXUP_END__ = .); PROVIDE (_GOT2_END_ = .); + PROVIDE (__GOT_START__ = .); PROVIDE (_GOT_START_ = .); s.got = .; .got : { *(.got) } -- cgit v1.2.3