OpenBIOS July 2007

openbios@openbios.org

3 participants
65 discussions

r469 - cpu cpu/i8051 forth/kernel
by svn＠openbios.org 16 Jul '07

16 Jul '07

Author: wmb Date: 2007-07-16 09:10:05 +0200 (Mon, 16 Jul 2007) New Revision: 469 Added: cpu/i8051/ cpu/i8051/kernel.bth cpu/i8051/metainit.fth cpu/i8051/target.fth forth/kernel/conf16.fth Log: Added basic structure for 8051 Forth kernel. Added: cpu/i8051/kernel.bth =================================================================== --- cpu/i8051/kernel.bth (rev 0) +++ cpu/i8051/kernel.bth 2007-07-16 07:10:05 UTC (rev 469) @@ -0,0 +1,103 @@ +purpose: Load file for x86 Forth kernel +\ See license at end of file + +command: &builder &this +build-now + +: \Tags [compile] \ ; immediate +: \NotTags ; immediate + +\ ' $report-name is include-hook ' noop is include-exit-hook + ' noop is include-hook ' noop is include-exit-hook + +warning off \ Turn OFF the warning messages + +: resident ; + +fload ${BP}/forth/kernel/conf16.fth +fload ${BP}/forth/kernel/meta1.fth + +only forth also meta also definitions +\needs 8015-assembler caps @ caps on fload ${BP}/cpu/i8051/assem.fth caps ! + +only forth also meta assembler also meta definitions +: assembler ( -- ) 8051-assembler ; + +only forth also meta also assembler definitions +fload ${BP}/forth/lib/loclabel.fth \ Local label assembler feature + +\ : : : lastacf .name cr ; \ Debugging tool + +fload ${BP}/cpu/i8051/target.fth \ Target configuration + +fload ${BP}/forth/kernel/forward.fth \ Metacompiler forward referencing +fload ${BP}/forth/kernel/metacompile.fth \ Metacompiler + +fload ${BP}/cpu/i8051/metainit.fth \ Turn on the metacompiler + +always-headers \ Don't omit any headers + +\ Comment out the following lines when debugging +-1 threshold ! \ Turn OFF ALL debugging messages +warning-t off \ Turn OFF target warning messages + +\ Uncomment the following line(s) for more debug output +\ show? on 1 granularity ! 1 threshold ! +\ warning-t on + +fload ${BP}/cpu/i8051/kerncode.fth \ CPU-dependent Forth kernel + +[ifdef] notdef \ This is the FirmWorks Forth kernel high-level code +: \tagvoc ; immediate +: \nottagvoc [compile] \ ; immediate + +\ fload ${BP}/forth/kernel/uservars.fth +\ fload ${BP}/forth/kernel/double.fth +\ \ : (d.) ( d -- adr len ) tuck dabs <# #s rot sign #> ; +\ \ fload ${BP}/forth/kernel/dmuldiv.fth + +\ fload ${BP}/forth/lib/bitops.fth +\ fload ${BP}/forth/lib/struct.fth +\ fload ${BP}/forth/kernel/kernel.fth +\ fload ${BP}/forth/kernel/sysio.fth +\ fload ${BP}/forth/lib/dumballo.fth +\ fload ${BP}/cpu/x86/syscall.fth +\ fload ${BP}/cpu/x86/boot.fth +\ fload ${BP}/forth/kernel/init.fth +\ fload ${BP}/cpu/x86/finish.fth +[then] + +' (do-literal) is do-literal + +\ Save the result to a file +writing kernel.img +origin-t >hostaddr here-t origin-t - ofd @ fputs +ofd @ fclose + +warning on + +hex + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/i8051/metainit.fth =================================================================== --- cpu/i8051/metainit.fth (rev 0) +++ cpu/i8051/metainit.fth 2007-07-16 07:10:05 UTC (rev 469) @@ -0,0 +1,62 @@ +\ See license at end of file +\ Metacompiler initialization + +\ Debugging aids + + +\ Threshold is the word number to start reporting progress +\ granularity is how often (how many words) to report progress +0 #words ! h# 0 threshold ! h# 10 granularity ! + +warning off +forth definitions + +metaon +meta definitions + +\ We want the kernel to be romable, so we put variables in the user area +:-h variable ( -- ) nuser ;-h +alias \m \ + +initmeta + +h# 10000 alloc-mem target-image \ Allocate space for the target image + +\ org sets the lowest address that is used by Forth kernel. +\ This number is a target token rather than an absolute address. +hex + +0.0000 org 0.0000 voc-link-t token-t! + +ps-size-t equ ps-size + +assembler + +\ This is at the first location in the Forth image. + +hex +mlabel cld + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/i8051/target.fth =================================================================== --- cpu/i8051/target.fth (rev 0) +++ cpu/i8051/target.fth 2007-07-16 07:10:05 UTC (rev 469) @@ -0,0 +1,216 @@ +\ See license at end of file +\ Target configuration - i8051 + +only forth also definitions + +decimal + +only forth also meta definitions + +: lobyte h# 0ff and ; +: hibyte 8 rshift lobyte ; + +2 constant /w-t +/l-t constant /n-t +/w-t constant /a-t +/a-t constant /thread-t +/w-t constant /token-t +/w-t constant /link-t +/token-t constant /defer-t +\ /n-t h# 600 * constant user-size-t +\ /n-t h# 100 * constant ps-size-t +\ /n-t h# 100 * constant rs-size-t +/w-t constant /user#-t + +\ user-size-t h# 10000 + constant max-kernel-t + +\ 32 bit host Forth compiling 16-bit target Forth + +: n->n-t ; immediate + +: c!-t ( n add -- ) >hostaddr c! ; +: c@-t ( target-address -- n ) >hostaddr c@ ; + +\ Intel processors are little-endian +: w!-t ( n add -- ) over lobyte over c!-t ca1+ swap hibyte swap c!-t ; +: w@-t ( target-address -- n ) dup c@-t swap 1+ c@-t 8 << or ; + +alias le-w!-t w!-t +alias le-w@-t w@-t + +: !-t ( n add -- ) w!-t ; +: @-t ( target-address -- n ) w@-t ; + +\ Store target data types into the host address space. +: c-t! ( c host-address -- ) c! ; +: w-t! ( w host-address -- ) + over lobyte over c-t! ca1+ swap hibyte swap c-t! +; +: n-t! ( n host-address -- ) w-t! ; + +\ Next 2 are machine-independent +: c,-t ( byte -- ) dp-t @ c!-t 1 dp-t +! ; +: w,-t ( word -- ) dp-t @ w!-t /w-t dp-t +! ; + +: ,-t ( n -- ) w,-t ; +: ,user#-t ( user# -- ) w,-t ; + +: a@-t ( target-address -- target-address ) w@-t origin-t + ; +: a!-t ( token target-address -- ) swap origin-t - swap w!-t ; +: token@-t ( target-address -- target-acf ) a@-t ; +: token!-t ( acf target-address -- ) a!-t ; + +: rlink@-t ( occurrence -- next-occurrence ) w@-t origin-t + ; +: rlink!-t ( next-occurrence occurrence -- ) swap origin-t - swap w!-t ; + +\ Machine independent +: a,-t ( adr -- ) here-t /a-t allot-t a!-t ; +: token,-t ( token -- ) here-t /token-t allot-t token!-t ; + +\ These versions of linkx-t are for absolute links +: link@-t ( target-address -- target-address' ) a@-t ; +: link!-t ( target-address target-address -- ) a!-t ; +: link,-t ( target-address -- ) a,-t ; + +: a-t@ ( host-address -- target-address ) w@ origin-t + ; +: a-t! ( target-address host-address -- ) swap origin-t - swap w! ; +: rlink-t@ ( host-adr -- target-adr ) w@ origin-t + ; +: rlink-t! ( target-adr host-adr -- ) swap origin-t - swap w! ; + +: token-t@ ( host-address -- target-acf ) a-t@ ; +: token-t! ( target-acf host-address -- ) a-t! ; + +: link-t@ ( host-address -- target-address ) a-t@ ; +: link-t! ( target-address host-address -- ) a-t! ; + +\ Machine independent +: a-t, ( target-address -- ) here /a-t allot a-t! ; +: token-t, ( target-address -- ) here /token-t allot token-t! ; + +\ Dictionary linked list; the list head is in the metacompiler environment +\ during metacompilation +1 constant #threads-t +create threads-t #threads-t /link-t * allot + +\ Choose the dictionary list head based on the word name +: $hash-t ( str-addr voc-ptr -- thread ) + nip swap c@ #threads-t 1- and /thread-t * + +; + +\ The user area image lives in the host address space. +\ We wish to store into the user area with -t commands so as not +\ to need separate words to store target items into host addresses. +\ That is why user+ returns a target address. + +\ Machine Independent + +0 constant userarea-t +: setup-user-area ( -- ) + here-t ['] userarea-t >body l! + here-t ['] init-user-area >body ! + user-size-t allot-t + userarea-t >hostaddr user-size-t erase +; + +: (>user-t) ( cfa-t -- user-address-t ) >body-t w@-t userarea-t + ; +: >user-t ( cfa-t -- user-address-h ) (>user-t) >hostaddr ; + +: n>link-t ( anf-t -- alf-t ) /link-t - ; +: l>name-t ( alf-t -- anf-t ) /link-t + ; + +decimal +1 constant #align-t +1 constant #talign-t +#align-t constant #acf-align-t + +1 constant #linkalign-t +: aligned-t ( n1 -- n2 ) #align-t 1- + #align-t negate and ; +: acf-aligned-t ( n1 -- n2 ) #acf-align-t 1- + #acf-align-t negate and ; + +: align-t ( -- ) + begin here-t #align-t 1- and while 0 c,-t repeat +; +: talign-t ( -- ) + begin here-t #talign-t 1- and while 0 c,-t repeat +; +: linkalign-t ( -- ) + begin here-t #linkalign-t 1- and while 0 c,-t repeat +; +: acf-align-t ( -- ) align-t ; + +: entercode ( -- ) + only forth also labels also meta also 8051-assembler +; + +\ Next 4 are Machine Independent +: cmove-t ( from to-t n -- ) + 0 ?do over c@ over c!-t 1+ swap 1+ swap loop 2drop +; +: place-cstr-t ( adr len cstr-adr-t -- cstr-adr-t ) + >r tuck r@ swap cmove-t ( len ) r@ + 0 swap c!-t r> +; +: "copy-t ( from to-t -- ) over c@ 2+ cmove-t ; +: toggle-t ( addr-t n -- ) swap >r r@ c@-t xor r> c!-t ; + +: clear-threads-t ( hostaddr -- ) + #threads-t /link-t * bounds do + origin-t i link-t! + /link +loop +; +: initmeta ( -- ) + init-relocation-t + threads-t clear-threads-t threads-t current-t ! +; + +\ For compiling branch offsets used by control constructs. +\ These compile relative branches. + +\ XXX this is wrong. We need to do some stuff like "lcall zerosense; jz <target>" +/w-t constant /branch +: branch! ( from-t target-addr-t -- ) over - swap ( offset from-t ) w!-t ; +: branch, ( target-t -- ) here-t - w,-t ; + +\ XXX FIXME for subroutine threaded +: >body-t ( cfa-t -- pfa-t ) /n-t + ; \ This version is for indirect threaded + +\ Store actions for some data types. + +: isuser ( n acf -- ) >user-t n-t! ; +: istuser ( acf1 acf -- ) (>user-t) >hostaddr token-t! ; +: isvalue ( n acf -- ) >user-t n-t! ; +: isdefer ( acf acf -- ) (>user-t) >hostaddr token-t! ; +: thread-t! ( thread adr -- ) link-t! ; + +only forth also meta also definitions +: install-target-assembler ( -- ) + [ also assembler ] + ['] here-t is here + ['] allot-t is asm-allot + ['] c!-t is asm8! + [ previous meta ] +; +: install-host-assembler ( -- ) [ assembler ] resident [ meta ] ; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: forth/kernel/conf16.fth =================================================================== --- forth/kernel/conf16.fth (rev 0) +++ forth/kernel/conf16.fth 2007-07-16 07:10:05 UTC (rev 469) @@ -0,0 +1,45 @@ +\ See license at end of file +purpose: Configure metacompiler to build a 16bit subroutine-threaded kernel + +only forth also definitions + +warning @ warning off +: 16\ ; immediate +: 32\ [compile] \ ; immediate +: 64\ [compile] \ ; immediate +warning ! + +: \itc-t ( -- ) [compile] \ ; immediate +: \dtc-t ( -- ) [compile] \ ; immediate +: \stc-t ( -- ) ; immediate +: \ttc-t ( -- ) [compile] \ ; immediate +: \t8-t ( -- ) [compile] \ ; immediate +: \t16-t ( -- ) ; immediate +: \t32-t ( -- ) [compile] \ ; immediate +: \t16-t ( -- ) [compile] \ ; immediate +: \tagvoc-t ( -- ) ; immediate +: \nottagvoc-t ( -- ) [compile] \ ; immediate + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

r165 - openbios-devel/arch/sparc64
by svn＠openbios.org 11 Jul '07

11 Jul '07

Author: blueswirl Date: 2007-07-11 21:48:31 +0200 (Wed, 11 Jul 2007) New Revision: 165 Modified: openbios-devel/arch/sparc64/openbios.c Log: NVRAM support (temporary location) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2007-07-11 19:46:26 UTC (rev 164) +++ openbios-devel/arch/sparc64/openbios.c 2007-07-11 19:48:31 UTC (rev 165) @@ -21,17 +21,92 @@ static unsigned char intdict[256 * 1024]; // XXX -void arch_nvram_put() +#define NVRAM_SIZE 0x2000 +#define NVRAM_IDPROM 0x1fd0 +#define NVRAM_OB_OFFSET 256 +#define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_OFFSET) & ~15) + +static struct qemu_nvram_v1 { + char id_string[16]; + uint32_t version; + uint32_t nvram_size; // not used in Sun4m + char unused1[8]; + char arch[12]; + char curr_cpu; + char smp_cpus; + char unused2; + char nographic; + uint32_t ram_size; + char boot_device; + char unused3[3]; + uint32_t kernel_image; + uint32_t kernel_size; + uint32_t cmdline; + uint32_t cmdline_size; + uint32_t initrd_image; + uint32_t initrd_size; + uint32_t nvram_image; + uint16_t width; + uint16_t height; + uint16_t depth; + char unused4[158]; + uint16_t crc; +} nv_info; + +#define OBIO_CMDLINE_MAX 256 +static char obio_cmdline[OBIO_CMDLINE_MAX]; + +void arch_nvram_get(char *data) { + unsigned short i; + unsigned char *nvptr = &nv_info; + uint32_t size; + extern uint32_t kernel_image; + extern uint32_t kernel_size; + extern uint32_t cmdline; + extern uint32_t cmdline_size; + extern char boot_device; + + for (i = 0; i < sizeof(struct qemu_nvram_v1); i++) { + outb(i & 0xff, 0x74); + outb(i >> 8, 0x75); + *nvptr++ = inb(0x77); + } + + kernel_image = nv_info.kernel_image; + kernel_size = nv_info.kernel_size; + size = nv_info.cmdline_size; + if (size > OBIO_CMDLINE_MAX - 1) + size = OBIO_CMDLINE_MAX - 1; + memcpy(obio_cmdline, nv_info.cmdline, size); + obio_cmdline[size] = '\0'; + cmdline = obio_cmdline; + cmdline_size = size; + printk("kernel addr %x size %x\n", kernel_image, kernel_size); + if (size) + printk("kernel cmdline %s\n", obio_cmdline); + + for (i = 0; i < NVRAM_OB_SIZE; i++) { + outb((i + NVRAM_OB_OFFSET) & 0xff, 0x74); + outb((i + NVRAM_OB_OFFSET) >> 8, 0x75); + data[i] = inb(0x77); + } } -void arch_nvram_get() +void arch_nvram_put(char *data) { + unsigned short i; + + for (i = 0; i < NVRAM_OB_SIZE; i++) { + outb((i + NVRAM_OB_OFFSET) & 0xff, 0x74); + outb((i + NVRAM_OB_OFFSET) >> 8, 0x75); + outb(data[i], 0x77); + } } int arch_nvram_size() { - return 8192; + return NVRAM_OB_SIZE; } void setup_timers() @@ -132,6 +207,9 @@ enterforth((xt_t)PC); arch_init(); // XXX + printk("force boot\n"); + push_str("/pci/isa/ide0/disk@0,0:a"); + boot(); // XXX printk("falling off...\n"); return 0; }

1 0

r164 - openbios-devel/modules
by svn＠openbios.org 11 Jul '07

11 Jul '07

Author: blueswirl Date: 2007-07-11 21:46:26 +0200 (Wed, 11 Jul 2007) New Revision: 164 Modified: openbios-devel/modules/client.c Log: Make client interface 64 bits wide on Sparc64 Modified: openbios-devel/modules/client.c =================================================================== --- openbios-devel/modules/client.c 2007-07-11 19:45:12 UTC (rev 163) +++ openbios-devel/modules/client.c 2007-07-11 19:46:26 UTC (rev 164) @@ -28,8 +28,8 @@ typedef struct prom_args { const char *service; - int nargs; - int nret; + long nargs; + long nret; ulong args[10]; /* MAX NUM ARGS! */ } prom_args_t;

1 0

r163 - openbios-devel/arch/sparc64
by svn＠openbios.org 11 Jul '07

11 Jul '07

Author: blueswirl Date: 2007-07-11 21:45:12 +0200 (Wed, 11 Jul 2007) New Revision: 163 Modified: openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/entry.S openbios-devel/arch/sparc64/ldscript Log: Change virtual address below 4G Map first 16M of RAM Execute a kernel if loaded by Qemu Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2007-07-09 16:27:25 UTC (rev 162) +++ openbios-devel/arch/sparc64/boot.c 2007-07-11 19:45:12 UTC (rev 163) @@ -28,11 +28,13 @@ char altpath[256]; if (kernel_size) { - int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); + void (*entry)(unsigned long p1, unsigned long p2, unsigned long p3, + unsigned long p4, unsigned long p5); + extern int of_client_interface( int *params ); printk("[sparc64] Kernel already loaded\n"); - entry = (void *) kernel_image; - entry(0, 0, 0, 0, 0); + entry = (void *) (unsigned long)kernel_image; + entry(0, 0, 0, 0, (unsigned long)&of_client_interface); } if(!path) { Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2007-07-09 16:27:25 UTC (rev 162) +++ openbios-devel/arch/sparc64/entry.S 2007-07-11 19:45:12 UTC (rev 163) @@ -12,6 +12,8 @@ #include "pstate.h" #include "lsu.h" +#define PROM_ADDR 0x1fff0000000 + .globl entry, _entry .section ".text", "ax" @@ -110,18 +112,19 @@ srlx %g5, 16, %g6 ! %g6 = # of 64k .rodata pages set 48, %g7 set 0x10000, %g5 + setx PROM_ADDR, %l1, %l2 1: stxa %g4, [%g7] ASI_DMMU ! vaddr = _rodata, ctx=0 set 0xa0000000, %g3 sllx %g3, 32, %g3 or %g3, 0x74, %g3 - or %g4, %g3, %g3 + or %l2, %g3, %g3 ! valid, 64k, locked, cacheable(I/E/C), priv ! paddr = _rodata + N * 0x10000 stxa %g3, [%g0] ASI_DTLB_DATA_IN add %g4, %g5, %g4 deccc %g6 bne 1b - nop + add %l2, %g5, %l2 ! setup VGA buffer setx 0x1ff004a0000, %g7, %g4 @@ -141,16 +144,24 @@ bne 1b nop -#if 0 - ! setup 0-4M +#if 1 + ! setup 0-16M + mov %g0, %g4 + mov 4, %g6 set 48, %g7 - stxa %g0, [%g7] ASI_DMMU ! vaddr = 0, ctx=0 + set 0x400000, %g5 +1: stxa %g4, [%g7] ASI_DMMU ! vaddr = 0, ctx=0 set 0xe0000000, %g3 sllx %g3, 32, %g3 or %g3, 0x36, %g3 + or %g4, %g3, %g3 ! valid, 4M, cacheable(I/E/C), priv, writable ! paddr = 0 stxa %g3, [%g0] ASI_DTLB_DATA_IN + add %g4, %g5, %g4 + deccc %g6 + bne 1b + nop #endif membar #Sync @@ -159,30 +170,39 @@ setx _rodata, %g7, %g5 sub %g5, %g4, %g5 srlx %g5, 16, %g6 ! %g6 = # of 64k .text pages + set 0x10000, %g5 set 48, %g7 + setx PROM_ADDR, %l1, %l2 1: stxa %g4, [%g7] ASI_IMMU ! vaddr = _start, ctx=0 set 0xa0000000, %g3 sllx %g3, 32, %g3 or %g3, 0x74, %g3 - or %g4, %g3, %g3 + or %l2, %g3, %g3 ! valid, 64k, locked, cacheable(I/E/C), priv ! paddr = _start + N * 0x10000 stxa %g3, [%g0] ASI_ITLB_DATA_IN - set 0x10000, %g5 add %g4, %g5, %g4 deccc %g6 bne 1b - nop + add %l2, %g5, %l2 -#if 0 - ! setup 0-4M - stxa %g0, [%g7] ASI_IMMU ! vaddr = 0, ctx=0 +#if 1 + ! setup 0-16M + mov %g0, %g4 + mov 4, %g6 + set 0x400000, %g5 +1: stxa %g4, [%g7] ASI_IMMU ! vaddr = 0, ctx=0 set 0xe0000000, %g3 sllx %g3, 32, %g3 or %g3, 0x34, %g3 + or %g4, %g3, %g3 ! valid, 4M, cacheable(I/E/C), priv ! paddr = 0 stxa %g3, [%g0] ASI_ITLB_DATA_IN + add %g4, %g5, %g4 + deccc %g6 + bne 1b + nop #endif flush %g4 @@ -193,18 +213,26 @@ sta %g0, [%g2] ASI_DMMU ! set primary ctx=0 ! Enable I/D MMUs and caches + setx lowmem, %g2, %g1 set LSU_CONTROL_DM|LSU_CONTROL_IM|LSU_CONTROL_DC|LSU_CONTROL_IC, %g2 - stxa %g2, [%g0] ASI_LSU_CONTROL + jmp %g1 + stxa %g2, [%g0] ASI_LSU_CONTROL +lowmem: /* Copy the DATA section from ROM. */ setx _data - 8, %o7, %o0 ! First address of DATA setx _bss, %o7, %o1 ! Last address of DATA + setx _start, %o7, %o2 + sub %o0, %o2, %o2 ! _data - _start + setx PROM_ADDR, %o7, %o3 + add %o3, %o2, %o2 ! PROM_ADDR + (_data - _start) ba 2f nop 1: - ldxa [%o0] ASI_PHYS_BYPASS_EC_E, %g1 + ldxa [%o2] ASI_PHYS_BYPASS_EC_E, %g1 stx %g1, [%o0] 2: + add %o2, 0x8, %o2 subcc %o0, %o1, %g0 bl 1b add %o0, 0x8, %o0 Modified: openbios-devel/arch/sparc64/ldscript =================================================================== --- openbios-devel/arch/sparc64/ldscript 2007-07-09 16:27:25 UTC (rev 162) +++ openbios-devel/arch/sparc64/ldscript 2007-07-11 19:45:12 UTC (rev 163) @@ -8,7 +8,7 @@ /* Initial load address */ -BASE_ADDR = 0x000001fff0000000; +BASE_ADDR = 0x00000000ffd00000; /* 16KB heap and stack */ HEAP_SIZE = 16384;

1 0

r468 - ofw/fs/fatfs
by svn＠openbios.org 09 Jul '07

09 Jul '07

Author: wmb Date: 2007-07-09 20:54:01 +0200 (Mon, 09 Jul 2007) New Revision: 468 Modified: ofw/fs/fatfs/partition.fth Log: disk-label partition handler - Removed a kludge that caused the presence of an ext2 partition to appear to be marked as bootable even if it wasn't. The problem symptom was that on a disk with a FAT FS in partition 1 and an EXT2 FS in partition 2, neither marked bootable, OFW would use partition 2 by default. Modified: ofw/fs/fatfs/partition.fth =================================================================== --- ofw/fs/fatfs/partition.fth 2007-07-08 18:59:17 UTC (rev 467) +++ ofw/fs/fatfs/partition.fth 2007-07-09 18:54:01 UTC (rev 468) @@ -102,12 +102,13 @@ : is-ufs? ( type -- type flag ) dup ufs-type = ; \ Matches partitions with the bootable flag set -\ : bootable? ( boot? type -- boot? type flag ) over h# 80 = ; -\ XXX kludge for Linux: bootable flag is not always set, accept ext2fs-type -: bootable? ( boot? type -- boot? type flag ) - over h# 80 = over h# 83 = or -; +: bootable? ( boot? type -- boot? type flag ) over h# 80 = ; +\ Kludge for Linux: bootable flag is not always set, accept ext2fs-type +\ : bootable? ( boot? type -- boot? type flag ) +\ over h# 80 = over h# 83 = or +\ ; + \ Matches the Nth partition, where N is initially stored in the value #part : nth? ( -- flag ) #part 1- dup to #part 0= ;

1 0

r162 - openbios-devel/drivers
by svn＠openbios.org 09 Jul '07

09 Jul '07

Author: blueswirl Date: 2007-07-09 18:27:25 +0200 (Mon, 09 Jul 2007) New Revision: 162 Modified: openbios-devel/drivers/ide.c Log: Fix read only location write attempt Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2007-07-09 16:25:32 UTC (rev 161) +++ openbios-devel/drivers/ide.c 2007-07-09 16:27:25 UTC (rev 162) @@ -1293,7 +1293,7 @@ char * nodetemp_chan = "/pci/isa/ide%d"; char * nodetemp = "/pci/isa/ide%d/%s"; - char * nodebuff = "/pci/isa/ide / "; + char nodebuff[32]; phandle_t dnode; for (i = 0; i < IDE_NUM_CHANNELS; i++) {

1 0

r161 - openbios-devel/include/sparc64
by svn＠openbios.org 09 Jul '07

09 Jul '07

Author: blueswirl Date: 2007-07-09 18:25:32 +0200 (Mon, 09 Jul 2007) New Revision: 161 Modified: openbios-devel/include/sparc64/io.h Log: Fix Sparc64 insw and outsw Modified: openbios-devel/include/sparc64/io.h =================================================================== --- openbios-devel/include/sparc64/io.h 2007-07-08 19:56:05 UTC (rev 160) +++ openbios-devel/include/sparc64/io.h 2007-07-09 16:25:32 UTC (rev 161) @@ -43,8 +43,8 @@ * are arrays of bytes, and byte-swapping is not appropriate in * that case. - paulus */ -#define insw(port, buf, ns) _insw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns)) -#define outsw(port, buf, ns) _outsw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns)) +#define insw(port, buf, ns) _insw((uint16_t *)((port)+_IO_BASE), (buf), (ns)) +#define outsw(port, buf, ns) _outsw((uint16_t *)((port)+_IO_BASE), (buf), (ns)) #define inb(port) in_8((uint8_t *)((port)+_IO_BASE)) #define outb(val, port) out_8((uint8_t *)((port)+_IO_BASE), (val))

1 0

Qemu/OpenBIOS Sparc64 system emulation progress
by Blue Swirl 08 Jul '07

08 Jul '07

Hi, Current versions of Qemu (with the attached PCI patch) and OpenBIOS get this far: OpenBIOS for Sparc64 boot arg = 0x0 00000000-08000000 RAM 128 MB forth started. initializing memory...done Initializing PCI devices... 0:0.0 - 108e:a000 - /pci/pci108e,a000 - host 0:1.0 - 108e:5000 - /pci/pci108e,5000 - pci 0:1.1 - 108e:5000 - /pci/pci108e,5000 - pci 0:2.0 - 1013:b8 - /pci/pci1013,b8 - display 0:3.0 - 10ec:8029 - /pci/pci10ec,8029 - ethernet 0:4.0 - 1095:646 - /pci/pci1095,646 - ide floppy_init FDC is a S82078B floppy_reset floppy_motor_off SENSEI 20 00 status = 80, reply_buffer= 20 0 fdc_specify FD_SPECIFY(c1, 11) set_drive status = 80, new_dor = 10 floppy_recalibrate fdc_state.version = 0062 invalid nvram partition length nvram error detected, zapping pram falling off... Unhandled Exception 0x0000000000000008 PC = 0x0000000000000008 NPC = 0x000000000000000c Stopping execution For some reason some C functions do not get called from Forth, so the booting does not start and execution falls off the main function. The PCI patch is just a quick hack to get PCI probing succeed, I won't commit it in yet.

1 0

r160 - openbios-devel/arch/sparc64
by svn＠openbios.org 08 Jul '07

08 Jul '07

Author: blueswirl Date: 2007-07-08 21:56:05 +0200 (Sun, 08 Jul 2007) New Revision: 160 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix nvram size, arch_init hack Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2007-07-08 19:53:20 UTC (rev 159) +++ openbios-devel/arch/sparc64/openbios.c 2007-07-08 19:56:05 UTC (rev 160) @@ -29,7 +29,10 @@ { } -int arch_nvram_size; +int arch_nvram_size() +{ + return 8192; +} void setup_timers() { @@ -128,5 +131,7 @@ #endif enterforth((xt_t)PC); + arch_init(); // XXX + printk("falling off...\n"); return 0; }

1 0

r159 - openbios-devel/arch/sparc64
by svn＠openbios.org 08 Jul '07

08 Jul '07

Author: blueswirl Date: 2007-07-08 21:53:20 +0200 (Sun, 08 Jul 2007) New Revision: 159 Modified: openbios-devel/arch/sparc64/entry.S Log: Revert previous patch Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2007-07-07 21:01:29 UTC (rev 158) +++ openbios-devel/arch/sparc64/entry.S 2007-07-08 19:53:20 UTC (rev 159) @@ -35,7 +35,7 @@ ! Extract NWINDOWS from %ver rdpr %ver, %g1 and %g1, 0xf, %g1 - sub %g1, 2, %g1 + dec %g1 wrpr %g1, 0, %cleanwin wrpr %g1, 0, %cansave wrpr %g0, 0, %canrestore

1 0