OpenBIOS September 2010

openbios@openbios.org

22 participants
46 discussions

Re: [OpenBIOS] Concatenating strings
by M A 07 Sep '10

07 Sep '10

> > On Sep 5, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > On 9/1/10 4:57 PM, Programmingkid wrote: > > On Sep 1, 2010, at 6:00 AM, openbios-request(a)openbios.org > <mailto:openbios-request@openbios.org> wrote: > > Message: 5 > Date: Tue, 31 Aug 2010 20:11:30 -0400 > From: Tarl Neustaedter <tarl-b2(a)tarl.net <mailto:tarl-b2@tarl.net>> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org > <mailto:openbios@openbios.org>> > Subject: Re: [OpenBIOS] Concatenating strings > Message-ID: <4C7D9A32.2070300(a)tarl.net > <mailto:4C7D9A32.2070300@tarl.net>> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 2010-8-31 8:06 PM, Programmingkid wrote: > Could someone provide me with a code example on how to combine two > strings > together in forth please. Here is my attempt. For some reason it > doesn't > work. Any help would be great. > > The below takes two strings of the form (addr len), allocates a chunk of > memory for them, and concatenates them into that allocated memory, > returning > addr len. > > : $cat2 ( $1 $2 -- $3 ) > 2 pick over + dup >r alloc-mem >r > 2swap tuck r@ swap move ( $2 $1-len ) > r@ + swap move ( ) > r> r> > ; > > Thank you very much Tarl. This word should be added to OpenBIOS. > > Please make sure whether the already existing functions (ie. in > openbios/forth/lib/string.fs) work for you before adding new stuff. > > Stefan Sorry Stefan, but the words there are not very useful. $cat looks a lot more useful and user-friendly than tmpstrcat. Adding $cat to string.fs would make an excellent addition the OpenBIOS.

1 0

[commit] r861 - in trunk/openbios-devel: . arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers include/drivers
by repository service 06 Sep '10

06 Sep '10

Author: blueswirl Date: Mon Sep 6 22:56:54 2010 New Revision: 861 URL: http://tracker.coreboot.org/trac/openbios/changeset/861 Log: Enable GCC warning flag -Wnested-externs, fix warnings Move nested extern declarations into header files, or use the already existing declarations. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/openbios.h trunk/openbios-devel/drivers/timer.c trunk/openbios-devel/drivers/timer.h trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/Makefile.target Mon Sep 6 22:56:54 2010 (r861) @@ -12,7 +12,7 @@ HOSTCFLAGS+= -O2 -g -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith HOSTCFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels -HOSTCFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +HOSTCFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs HOSTCFLAGS+= -W HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include @@ -27,7 +27,7 @@ CFLAGS+= -Os -g -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS CFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith CFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels -CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs CFLAGS+= -Werror INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Sep 6 22:56:54 2010 (r861) @@ -50,7 +50,6 @@ static uint16_t machine_id = 0; extern void unexpected_excep( int vector ); -extern void setup_timers( void ); void unexpected_excep( int vector ) Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/sparc32/context.c Mon Sep 6 22:56:54 2010 (r861) @@ -8,6 +8,7 @@ #include "context.h" #include "libopenbios/sys_info.h" #include "boot.h" +#include "openbios.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096 @@ -46,7 +47,6 @@ static void start_main(void) { int retval; - extern int openbios(void); /* Save startup context, so we can refer to it later. * We have to keep it in physical address since we will relocate. */ Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/sparc64/context.c Mon Sep 6 22:56:54 2010 (r861) @@ -8,6 +8,7 @@ #include "context.h" #include "libopenbios/sys_info.h" #include "boot.h" +#include "openbios.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096*2 @@ -46,7 +47,6 @@ static void start_main(void) { int retval; - extern int openbios(void); /* Save startup context, so we can refer to it later. * We have to keep it in physical address since we will relocate. */ Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/x86/context.c Mon Sep 6 22:56:54 2010 (r861) @@ -12,6 +12,7 @@ #include "context.h" #include "libopenbios/sys_info.h" #include "boot.h" +#include "openbios.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096 @@ -57,8 +58,6 @@ static void start_main(void) { int retval; - extern int openbios(void); - extern void init_exceptions(void); /* Save startup context, so we can refer to it later. * We have to keep it in physical address since we will relocate. */ Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/x86/openbios.c Mon Sep 6 22:56:54 2010 (r861) @@ -50,8 +50,6 @@ static void arch_init( void ) { - void setup_timers(void); - openbios_init(); modules_init(); #ifdef CONFIG_DRIVER_PCI Modified: trunk/openbios-devel/arch/x86/openbios.h ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.h Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/x86/openbios.h Mon Sep 6 22:56:54 2010 (r861) @@ -19,6 +19,9 @@ int openbios(void); +/* entry.S */ +void init_exceptions(void); + /* console.c */ extern void cls(void); #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/drivers/timer.c ============================================================================== --- trunk/openbios-devel/drivers/timer.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/drivers/timer.c Mon Sep 6 22:56:54 2010 (r861) @@ -10,6 +10,7 @@ */ #include "config.h" +#include "drivers/drivers.h" #include "timer.h" #include "asm/io.h" @@ -86,7 +87,6 @@ void udelay(unsigned int usecs) { - extern void _wait_ticks(unsigned long); unsigned long ticksperusec = get_timer_freq() / 1000000; _wait_ticks(ticksperusec * usecs); } Modified: trunk/openbios-devel/drivers/timer.h ============================================================================== --- trunk/openbios-devel/drivers/timer.h Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/drivers/timer.h Mon Sep 6 22:56:54 2010 (r861) @@ -48,13 +48,15 @@ #define PPCB_SPKR 0x02 /* Bit 1 */ #define PPCB_T2GATE 0x01 /* Bit 0 */ -extern void setup_timers(void); extern void ndelay(unsigned int nsecs); extern void udelay(unsigned int usecs); extern void mdelay(unsigned int msecs); extern unsigned long currticks(void); extern unsigned long get_timer_freq(void); +/* arch/ppc/timebase.S */ +void _wait_ticks(unsigned long nticks); + #define TICKS_PER_SEC 1000 #endif /* TIMER_H */ Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/include/drivers/drivers.h Mon Sep 6 22:56:54 2010 (r861) @@ -123,4 +123,8 @@ unsigned char keyboard_readdata(void); #endif #endif + +/* drivers/timer.c */ +void setup_timers(void); + #endif /* OPENBIOS_DRIVERS_H */

1 0

[commit] r860 - trunk/openbios-devel/libopenbios
by repository service 06 Sep '10

06 Sep '10

Author: blueswirl Date: Mon Sep 6 22:56:52 2010 New Revision: 860 URL: http://tracker.coreboot.org/trac/openbios/changeset/860 Log: Fix x86 target build OFmem is not available on x86. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/elf_load.c Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Wed Aug 25 18:58:55 2010 (r859) +++ trunk/openbios-devel/libopenbios/elf_load.c Mon Sep 6 22:56:52 2010 (r860) @@ -506,7 +506,7 @@ size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); if (!size) continue; -#ifndef CONFIG_SPARC32 +#if !defined(CONFIG_SPARC32) && !defined(CONFIG_X86) if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) { printk("Ignoring failed claim for va %lx memsz %lx!\n", (unsigned long)phdr[i].p_vaddr,

1 0

Re: [OpenBIOS] Concatenating strings
by Programmingkid 04 Sep '10

04 Sep '10

On Sep 1, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > Message: 5 > Date: Tue, 31 Aug 2010 20:11:30 -0400 > From: Tarl Neustaedter <tarl-b2(a)tarl.net> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Concatenating strings > Message-ID: <4C7D9A32.2070300(a)tarl.net> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 2010-8-31 8:06 PM, Programmingkid wrote: >> Could someone provide me with a code example on how to combine two strings >> together in forth please. Here is my attempt. For some reason it doesn't >> work. Any help would be great. > > The below takes two strings of the form (addr len), allocates a chunk of > memory for them, and concatenates them into that allocated memory, returning > addr len. > > : $cat2 ( $1 $2 -- $3 ) > 2 pick over + dup >r alloc-mem >r > 2swap tuck r@ swap move ( $2 $1-len ) > r@ + swap move ( ) > r> r> > ; Thank you very much Tarl. This word should be added to OpenBIOS.

2 1

SPARC64: Forth re-entrancy during MMU I/D TLB miss
by Mark Cave-Ayland 04 Sep '10

04 Sep '10

Hi everyone, So having a poke around various bits of documentation relating to implementing pgmap@, I've come to the realisation that since the Solaris kernel needs to install it's own va>tte-data implementation into OpenBIOS then it's going to be necessary to call back into Forth from the D/I-MMU miss traps. I've been looking around the code in arch/sparc64/switch.S but it looks as if this code only swaps between 2 individual contexts - am I right in thinking there needs to be a way of specifying the memory address of the context for this code to be reusable during a trap? Or would a better way be to duplicate this file but with another static context used only for MMU miss traps? Another question for PPC users: will pgmap@/pgmap! be required there too? I'm trying to figure out if this is something that needs to live within libopenbios/ofmem_common.c or whether it's just a SPARC-specific hack. It looks as if these words are also required for SPARC32 so I'm leaning towards the former... ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

2 3

Concatenating strings
by Programmingkid 01 Sep '10

01 Sep '10

Could someone provide me with a code example on how to combine two strings together in forth please. Here is my attempt. For some reason it doesn't work. Any help would be great. \ (addr len -- ) : loadLocalVariable dup 9 + dup >r alloc-mem " variable " rot dup >r swap move r> r> + swap 3dup move 9 + dup >r - r> eval drop ; All this code does this basically sprintf(defineVariableCommandString, "variable %s", variableString); feval(defineVariableCommandString); Boy I love C.

2 1