OpenBIOS August 2007

openbios@openbios.org

12 participants
103 discussions

r527 - in ofw: inet inetv6
by svn＠openbios.org 06 Aug '07

06 Aug '07

Author: wmb Date: 2007-08-06 03:11:12 +0200 (Mon, 06 Aug 2007) New Revision: 527 Modified: ofw/inet/http.fth ofw/inet/httpdpkg.fth ofw/inetv6/http.fth ofw/inetv6/httpdpkg.fth Log: More changes to ensure that base doesn't change. Modified: ofw/inet/http.fth =================================================================== --- ofw/inet/http.fth 2007-08-06 01:02:44 UTC (rev 526) +++ ofw/inet/http.fth 2007-08-06 01:11:12 UTC (rev 527) @@ -122,9 +122,9 @@ : parse-line ( adr len -- ) save-input 2>r 2>r 2>r -1 set-input - push-decimal - parse-word ['] http-tags search-wordlist if execute then - pop-base + parse-word ['] http-tags search-wordlist if + push-decimal ['] execute catch pop-base throw + then 2r> 2r> 2r> restore-input ; @@ -276,7 +276,7 @@ mount 0= bootnet-debug if ." HTTP: " - dup if ." Succeded" else ." Failed!" then cr + dup if ." Succeeded" else ." Failed!" then cr then else 2drop true Modified: ofw/inet/httpdpkg.fth =================================================================== --- ofw/inet/httpdpkg.fth 2007-08-06 01:02:44 UTC (rev 526) +++ ofw/inet/httpdpkg.fth 2007-08-06 01:11:12 UTC (rev 527) @@ -212,11 +212,7 @@ sbuf r> ( $3 ) ; -: create-num$ ( len -- num$ ) - base @ >r decimal ( len ) ( r: base ) - num>ascii ( num$ ) - r> base ! ( num$ ) -; +: create-num$ ( len -- num$ ) push-decimal num>ascii pop-base ; : get-type ( adr len -- c ) 0 -rot Modified: ofw/inetv6/http.fth =================================================================== --- ofw/inetv6/http.fth 2007-08-06 01:02:44 UTC (rev 526) +++ ofw/inetv6/http.fth 2007-08-06 01:11:12 UTC (rev 527) @@ -136,9 +136,9 @@ : parse-line ( adr len -- ) save-input 2>r 2>r 2>r -1 set-input - push-decimal - parse-word ['] http-tags search-wordlist if execute then - pop-base + parse-word ['] http-tags search-wordlist if + push-decimal ['] execute catch pop-base throw + then 2r> 2r> 2r> restore-input ; Modified: ofw/inetv6/httpdpkg.fth =================================================================== --- ofw/inetv6/httpdpkg.fth 2007-08-06 01:02:44 UTC (rev 526) +++ ofw/inetv6/httpdpkg.fth 2007-08-06 01:11:12 UTC (rev 527) @@ -212,11 +212,7 @@ sbuf r> ( $3 ) ; -: create-num$ ( len -- num$ ) - base @ >r decimal ( len ) ( r: base ) - num>ascii ( num$ ) - r> base ! ( num$ ) -; +: create-num$ ( len -- num$ ) push-decimal num>ascii pop-base ; : get-type ( adr len -- c ) 0 -rot

1 0

r526 - in ofw: inet inetv6
by svn＠openbios.org 06 Aug '07

06 Aug '07

Author: wmb Date: 2007-08-06 03:02:44 +0200 (Mon, 06 Aug 2007) New Revision: 526 Modified: ofw/inet/dns.fth ofw/inetv6/dns.fth Log: Use of malformed dotted IP addresses could leave base set to decimal. Modified: ofw/inet/dns.fth =================================================================== --- ofw/inet/dns.fth 2007-08-06 00:29:32 UTC (rev 525) +++ ofw/inet/dns.fth 2007-08-06 01:02:44 UTC (rev 526) @@ -233,13 +233,11 @@ : ?bad-ip ( flag -- ) abort" Bad host name or address" ; 4 buffer: ip-buf : $>ip ( adr len -- 'ip ) - push-decimal ip-buf 4 bounds do - [char] . left-parse-string $number ?bad-ip + [char] . left-parse-string push-decimal $number pop-base ?bad-ip dup d# 256 >= ?bad-ip i c! loop - pop-base 2drop ip-buf ; Modified: ofw/inetv6/dns.fth =================================================================== --- ofw/inetv6/dns.fth 2007-08-06 00:29:32 UTC (rev 525) +++ ofw/inetv6/dns.fth 2007-08-06 01:02:44 UTC (rev 526) @@ -233,13 +233,11 @@ : ?bad-ip ( flag -- ) abort" Bad host name or address" ; 4 buffer: ip-buf : $>ip ( adr len -- 'ip ) - push-decimal ip-buf 4 bounds do - [char] . left-parse-string $number ?bad-ip + [char] . left-parse-string push-decimal $number pop-base ?bad-ip dup d# 256 >= ?bad-ip i c! loop - pop-base 2drop ip-buf ;

1 0

r525 - ofw/inetv6
by svn＠openbios.org 06 Aug '07

06 Aug '07

Author: lwalter Date: 2007-08-06 02:29:32 +0200 (Mon, 06 Aug 2007) New Revision: 525 Modified: ofw/inetv6/http.fth ofw/inetv6/neighdis.fth ofw/inetv6/tcpv6.fth Log: HTTP from local IPv6 address debugged. Modified: ofw/inetv6/http.fth =================================================================== --- ofw/inetv6/http.fth 2007-08-04 20:14:30 UTC (rev 524) +++ ofw/inetv6/http.fth 2007-08-06 00:29:32 UTC (rev 525) @@ -88,9 +88,23 @@ drop swap - update-ptr ( len ) ; +false instance value ipv6-host$? +: parse-ipv6-port ( server$ -- server$' port$ ) + 1 /string + [char] ] left-parse-string ( port$ server$ ) + 2swap [char] : left-parse-string ( server$ port$ junk$ ) + 2drop ( server$ port$ ) +; + : parse-port ( server$ -- port# server$' ) - [char] : left-parse-string ( port$ server$ ) - 2swap dup if ( server$ port$ ) + over c@ [char] [ = dup to ipv6-host$? if + parse-ipv6-port ( server$ port$ ) + else + + [char] : left-parse-string ( port$ server$ ) + 2swap ( server$ port$ ) + then + dup if ( server$ port$ ) push-decimal $number pop-base ( server$ port# error? ) abort" Bad port number" ( server$ port# ) else ( server$ port$ ) @@ -260,8 +274,11 @@ " GET " tcp-write ( send$ prefix$ server$ ) 2swap tcp-write 2swap tcp-write ( server$ ) - " HTTP/1.1"r"nUser-Agent: FirmWorks/1.1"r"nHost: " tcp-write - tcp-write " "r"n"r"n" tcp-write + " HTTP/1.1"r"nUser-Agent: FirmWorks/1.1"r"nHost: " tcp-write + ipv6-host$? if " [" tcp-write then + ( server$ ) tcp-write + ipv6-host$? if " ]" tcp-write then + " "r"n"r"n" tcp-write " flush-writes" $call-parent @@ -276,7 +293,7 @@ mount 0= bootnet-debug if ." HTTP: " - dup if ." Succeded" else ." Failed!" then cr + dup if ." Succeeded" else ." Failed!" then cr then else 2drop true Modified: ofw/inetv6/neighdis.fth =================================================================== --- ofw/inetv6/neighdis.fth 2007-08-04 20:14:30 UTC (rev 524) +++ ofw/inetv6/neighdis.fth 2007-08-06 00:29:32 UTC (rev 525) @@ -79,12 +79,21 @@ then ; +create default-ipv6-addr h# fe c, h# 80 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, + 0 c, 0 c, 0 c, h# ff c, h# fe c, 0 c, 0 c, 0 c, +: set-my-ipv6-addr ( -- ) + default-ipv6-addr my-ipv6-addr copy-ipv6-addr + my-en-addr c@ 2 xor my-ipv6-addr 8 + c! + my-en-addr 1+ my-ipv6-addr 9 + 2 move + my-en-addr 3 + my-ipv6-addr d# 13 + 3 move +; + : configure-ipv6 ( -- ) \ Get discovery info ['] 4drop to icmpv6-err-callback-xt ['] 2drop to icmpv6-info-callback-xt d# 64 to prefix - " fe80::259:08ff:feb4:0061" my-ipv6-addr $ipv6# + set-my-ipv6-addr set-my-mc-ipv6-addr \ XXX Duplicate address discovery; Router discovery Modified: ofw/inetv6/tcpv6.fth =================================================================== --- ofw/inetv6/tcpv6.fth 2007-08-04 20:14:30 UTC (rev 524) +++ ofw/inetv6/tcpv6.fth 2007-08-06 00:29:32 UTC (rev 525) @@ -212,40 +212,42 @@ [ifndef] include-ipv4 : +rcv_nxt ( n -- ) rcv_nxt + to rcv_nxt ; +[then] -0 value wbuf-start -0 value wbuf-adr -0 value wbuf-top -0 value wbuf-end -0 value wbuf-threshold +0 value wbufv6-start +0 value wbufv6-adr +0 value wbufv6-top +0 value wbufv6-end +0 value wbufv6-threshold -d# 1024 d# 16 * constant /wbuf -: wbuf-clear ( -- ) - wbuf-start /wbuf + to wbuf-end - wbuf-start dup to wbuf-adr to wbuf-top - wbuf-start /wbuf 2/ + to wbuf-threshold +d# 1024 d# 16 * constant /wbufv6 +: wbufv6-clear ( -- ) + wbufv6-start /wbufv6 + to wbufv6-end + wbufv6-start dup to wbufv6-adr to wbufv6-top + wbufv6-start /wbufv6 2/ + to wbufv6-threshold ; -: wbuf-allocate ( -- ) - /wbuf alloc-mem to wbuf-start - wbuf-clear +: wbufv6-allocate ( -- ) + /wbufv6 alloc-mem to wbufv6-start + wbufv6-clear ; -: wbuf-actual ( -- n ) wbuf-top wbuf-adr - ; -: wbuf-avail ( -- n ) wbuf-end wbuf-top - ; +: wbufv6-actual ( -- n ) wbufv6-top wbufv6-adr - ; +: wbufv6-avail ( -- n ) wbufv6-end wbufv6-top - ; \ Remove n bytes of data from the beginning of the write buffer -: wbuf-drop ( n -- ) - wbuf-adr + to wbuf-adr +: wbufv6-drop ( n -- ) + wbufv6-adr + to wbufv6-adr \ If there are enough empty bytes at the beginning to make \ it worthwhile to do so, copy the data down to make more \ space at the end. - wbuf-adr wbuf-threshold >= if - wbuf-adr wbuf-start wbuf-actual move \ Copy bytes down - wbuf-actual wbuf-start + to wbuf-top \ Fix pointers - wbuf-start to wbuf-adr + wbufv6-adr wbufv6-threshold >= if + wbufv6-adr wbufv6-start wbufv6-actual move \ Copy bytes down + wbufv6-actual wbufv6-start + to wbufv6-top \ Fix pointers + wbufv6-start to wbufv6-adr then ; +[ifndef] include-ipv4 \ send sequence variables 0 instance value snd_una \ send unacknowledged 0 instance value snd_nxt \ send next @@ -728,7 +730,9 @@ 0 value win 0 value offs -: dont-send? ( -- exit? ) +[then] + +: dont-sendv6? ( -- exit? ) false \ Sender silly window avoidance. If connection is idle and can send @@ -741,7 +745,7 @@ len if len t_maxseg = ?exit - idle? nodelay t_flag? or len offs + wbuf-actual >= and ?exit + idle? nodelay t_flag? or len offs + wbufv6-actual >= and ?exit t_force ?exit @@ -796,7 +800,7 @@ \ If nothing happens soon, send when timer expires: \ if window is nonzero, transmit what we can, otherwise force out a byte. - wbuf-actual 0<> tcpt_rexmt @ 0= and tcpt_persist @ 0= and if + wbufv6-actual 0<> tcpt_rexmt @ 0= and tcpt_persist @ 0= and if 0 to t_rxtshift setpersist then @@ -804,6 +808,7 @@ drop true ; +[ifndef] include-ipv4 \ TCP output routine: figure out what should be sent and send it. d# 32 buffer: opt 0 value hdrlen @@ -849,14 +854,14 @@ xmit_bufv6 set-struct len if - wbuf-adr offs + xmit_bufv6 hdrlen + len move + wbufv6-adr offs + xmit_bufv6 hdrlen + len move \ If we're sending everything we've got, set PUSH. \ (This will keep happy those implementations which only \ give data to the user when a buffer fills or \ a PUSH comes in.) - offs len + wbuf-actual = + offs len + wbufv6-actual = len snd_cwnd = or \ Also PUSH when we have a lot if oflags th_push or to oflags @@ -1033,12 +1038,12 @@ \ \ We can't just blindly clear the FIN bit, because if we don't \ have any more data to send then the probe will be the FIN itself. - off wbuf-actual < if fin-off then + off wbufv6-actual < if fin-off then 1 to win then then - win wbuf-actual < if fin-off win else wbuf-actual then ( n ) + win wbufv6-actual < if fin-off win else wbufv6-actual then ( n ) offs - to len len 0< if @@ -1056,7 +1061,7 @@ rbuf-space to win - dont-send? ?exit + dont-sendv6? ?exit sendv6 sendalot? 0= until @@ -1106,7 +1111,7 @@ then iack snd_una - to acked \ XXX drop-snd needs to "wakeup" the sender - acked wbuf-drop + acked wbufv6-drop iack to snd_una \ We are now finished with the packet data @@ -1121,7 +1126,7 @@ snd_una snd_max = if tcpt_rexmt off else tcpt_persist @ 0= if t_rxtcur tcpt_rexmt ! then then - wbuf-actual if tcp_outputv6 then + wbufv6-actual if tcp_outputv6 then true exit then false exit @@ -1576,18 +1581,18 @@ tcp_close ; +[then] \ Discard from the buffer the transmitted data that was acked -: release-data ( -- flag ) - acked wbuf-actual > dup if ( flag ) - snd_wnd wbuf-actual - to snd_wnd ( flag ) - wbuf-actual wbuf-drop ( flag ) +: release-datav6 ( -- flag ) + acked wbufv6-actual > dup if ( flag ) + snd_wnd wbufv6-actual - to snd_wnd ( flag ) + wbufv6-actual wbufv6-drop ( flag ) else ( flag ) - acked wbuf-drop ( flag ) + acked wbufv6-drop ( flag ) snd_wnd acked - to snd_wnd ( flag ) then ( flag ) ; -[then] : do-ackv6 ( -- done? ) ts syn_received = if @@ -1692,7 +1697,7 @@ snd_cwnd snd_ssthresh u> if dup u* snd_cwnd / then ( cwnd-increment ) snd_cwnd + maxwin min set-cwnd - release-data to ourfinisacked? + release-datav6 to ourfinisacked? \ wakeup-sender @@ -1987,24 +1992,24 @@ /tcphdr d# 32 + mssmax + constant /xmit-max : alloc-buffers ( -- ) - wbuf-allocate d# 1024 d# 16 * to rbuf-len rbuf-len alloc-mem to rbuf-adr 0 to rbuf-actual ; : free-buffers ( -- ) - wbuf-start /wbuf free-mem rbuf-adr rbuf-len free-mem ; [then] \ This is basically attach : alloc-buffersv6 ( -- ) + wbufv6-allocate /xmit-max " allocate-ipv6" $call-parent to xmit_bufv6 ; : free-buffersv6 ( -- ) free-buffers + wbufv6-start /wbufv6 free-mem xmit_bufv6 /xmit-max " free-ipv6" $call-parent ; @@ -2265,17 +2270,18 @@ ?receivev6 ; -[ifndef] include-ipv4 -: wbuf-set ( adr len -- ) over to wbuf-adr + to wbuf-top ; -: wbuf-add ( adr len -- #added ) - wbuf-avail min ( adr #added ) +: wbufv6-set ( adr len -- ) over to wbufv6-adr + to wbufv6-top ; +: wbufv6-add ( adr len -- #added ) + wbufv6-avail min ( adr #added ) dup if ( adr #added ) - tuck wbuf-top swap move ( #added ) - dup wbuf-top + to wbuf-top ( #added ) + tuck wbufv6-top swap move ( #added ) + dup wbufv6-top + to wbufv6-top ( #added ) else ( adr 0 ) nip ( 0 ) then ( #added ) ; + +[ifndef] include-ipv4 : read ( adr len -- actual ) 2drop 0 ; : write ( adr len -- actual ) 2drop 0 ; : write-oob ( adr len -- actual ) 2drop 0 ; @@ -2285,7 +2291,7 @@ : writev6 ( adr len -- actual ) tuck begin ( len adr remaining ) alive? 0= if 3drop -1 exit then - 2dup wbuf-add /string ( len adr' remaining' ) + 2dup wbufv6-add /string ( len adr' remaining' ) dup while ( len adr' remaining' ) tcp_outputv6 pollv6 ( len adr' remaining' ) repeat ( len adr 0 ) @@ -2465,11 +2471,11 @@ : flush-writesv6 ( -- ) \ If the connection is already down, just blow away any pending data - ts closed = if wbuf-clear exit then + ts closed = if wbufv6-clear exit then get-msecs begin - wbuf-actual 0<> ( start-time flag ) + wbufv6-actual 0<> ( start-time flag ) get-msecs 2 pick - d# 10000 < ( start-time flag flag ) and ( start-time flag' ) while ( start-time ) @@ -2477,10 +2483,10 @@ repeat ( start-time ) drop ( ) - wbuf-actual 0<> if + wbufv6-actual 0<> if show" TDROP" debug" TCP Timeout!" - wbuf-clear + wbufv6-clear then ;

1 0

r168 - openbios-devel/drivers
by svn＠openbios.org 05 Aug '07

05 Aug '07

Author: blueswirl Date: 2007-08-05 20:01:20 +0200 (Sun, 05 Aug 2007) New Revision: 168 Modified: openbios-devel/drivers/obio.c Log: Enable all interrupt sources for NetBSD Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-07-29 20:20:46 UTC (rev 167) +++ openbios-devel/drivers/obio.c 2007-08-05 18:01:20 UTC (rev 168) @@ -927,7 +927,7 @@ fword("property"); intregs = map_io(base | (uint64_t)offset, sizeof(*intregs)); - intregs->set = ~SUN4M_INT_MASKALL; + intregs->clear = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; for (i = 0; i < SUN4M_NCPU; i++) {

1 0

r524 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Aug '07

04 Aug '07

Author: wmb Date: 2007-08-04 22:14:30 +0200 (Sat, 04 Aug 2007) New Revision: 524 Modified: cpu/x86/pc/olpc/vsapci.fth Log: OLPC PCI spoofing - Fixed a bug that caused GX-based systems to see a phantom AES device. The observed symptom was the message: Can't assign address ranges larger than 32-bits Modified: cpu/x86/pc/olpc/vsapci.fth =================================================================== --- cpu/x86/pc/olpc/vsapci.fth 2007-08-03 00:59:36 UTC (rev 523) +++ cpu/x86/pc/olpc/vsapci.fth 2007-08-04 20:14:30 UTC (rev 524) @@ -152,7 +152,7 @@ h# 7d00 of ehci-hdr endof h# 800 of nb-hdr endof h# 900 of gxfb-hdr endof - h# a00 of gx? if ff-loc else aes-hdr then endof + h# a00 of gx? if drop ff-loc exit else aes-hdr then endof ( default ) 2drop ff-loc exit endcase +hdr

1 0

r523 - dev/olpc/kb3700
by svn＠openbios.org 03 Aug '07

03 Aug '07

Author: wmb Date: 2007-08-03 02:59:36 +0200 (Fri, 03 Aug 2007) New Revision: 523 Modified: dev/olpc/kb3700/battery.fth dev/olpc/kb3700/ecio.fth Log: OLPC watch-battery - improved watch-battery by adding extra info like the battery manufacturer and type, and improving the formatting. Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2007-08-03 00:57:32 UTC (rev 522) +++ dev/olpc/kb3700/battery.fth 2007-08-03 00:59:36 UTC (rev 523) @@ -13,7 +13,6 @@ : eram-w@ h# f400 + dup 1+ ec@ swap ec@ bwjoin ; \ Base unit for temperature is 1/256 degrees C : >degrees-c 7 rshift 1+ 2/ ; \ Round to nearest degree -: .% ( n -- ) .d ." %" ; \ : uvolt@ 0 bat-w@ d# 9760 d# 32 */ ; \ : cur@ 2 bat-w@ wextend d# 15625 d# 120 */ ; \ : pcb-temp 8 bat-w@ >degrees-c ; @@ -57,18 +56,18 @@ ," abnormal: " end-string-array -: .bat-status - bat-status@ - ." AC " dup h# 10 and if ." on " else ." off " then +: .bat-type ( -- ) + bat-type@ dup 4 rshift case ( type ) + 1 of ." GPB " endof + 2 of ." BYD " endof + ." UnknownVendor " + endcase ( type ) - dup 1 and if - dup 2 and if ." Battery full " then - dup 4 and if ." Battery low " then - dup 8 and if ." Battery destroyed " then - else - ." No battery" - then - drop + h# 0f and case ( ) + 1 of ." NiMH " endof + 2 of ." LiFePO4 " endof + ." UnknownType " + endcase ; : .milli ( -- ) @@ -76,18 +75,33 @@ dup abs d# 10,000 / <# u# u# [char] . hold u#s swap sign u#> type pop-base ; +: 2.d ( n -- ) push-decimal <# u# u#s u#> type pop-base ; +: .% ( n -- ) 2.d ." %" ; : .bat ( -- ) - ." Battery: " - soc .% ." " - uvolt@ .milli ." V " - cur@ .milli ." A " - bat-temp .d ." C " - .bat-status - ." (PCB " pcb-temp .d ." C)" + bat-status@ ( stat ) + ." AC: " dup h# 10 and if ." on " else ." off " then ( stat ) + ." PCB: " pcb-temp 2.d ." C " + + dup 1 and if + ." Battery: " + .bat-type + soc .% ." " + uvolt@ .milli ." V " + cur@ .milli ." A " + bat-temp 2.d ." C " + dup 2 and if ." full " then + dup 4 and if ." low " then + dup 8 and if ." error " then + dup h# 20 and if ." charging " then + dup h# 40 and if ." discharging " then + else + ." No battery" + then + drop ; : watch-battery ( -- ) cursor-off - begin (cr .bat d# 100 ms key? until + begin (cr .bat kill-line d# 1000 ms key? until key drop cursor-on ; Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-08-03 00:57:32 UTC (rev 522) +++ dev/olpc/kb3700/ecio.fth 2007-08-03 00:59:36 UTC (rev 523) @@ -63,6 +63,7 @@ : bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; : bat-gauge-id@ ( -- sn0 .. sn7 ) h# 17 ec-cmd-out 8 0 do ec-rb loop ; : bat-gauge@ ( -- b ) h# 18 ec-cmd-out h# 31 ec-wb ec-rb ; \ 31 is the EEPROM address +: bat-type@ ( -- b ) h# 18 ec-cmd-out h# 5f ec-wb ec-rb ; \ 5f is the EEPROM address : board-id@ ( -- b ) h# 19 ec-cmd-b@ ; : sci-source@ ( -- b ) h# 1a ec-cmd-b@ ; : sci-mask! ( b -- ) h# 1b ec-cmd-b! ;

1 0

r522 - ofw/core
by svn＠openbios.org 03 Aug '07

03 Aug '07

Author: wmb Date: 2007-08-03 02:57:32 +0200 (Fri, 03 Aug 2007) New Revision: 522 Modified: ofw/core/filecmds.fth ofw/core/ofwfw.fth Log: Integrated OFW device tree "$create-file" into the Forthmacs file interface wordset so you can say, e.g. "writing <device_specifier>". Modified: ofw/core/filecmds.fth =================================================================== --- ofw/core/filecmds.fth 2007-08-03 00:55:32 UTC (rev 521) +++ ofw/core/filecmds.fth 2007-08-03 00:57:32 UTC (rev 522) @@ -297,6 +297,13 @@ public +: $delete1 ( path$ -- ) + open-directory ?dup 0= abort" Can't open directory" ( name$ dir-ih ) + >r " $delete!" r@ $call-method abort" Can't delete file" ( r: dir-ih ) + r> close-dev +; +' $delete1 to _ofdelete + : $delete-all ( pattern-adr pattern-len -- ) begin-search begin another-match? while ( 8*attributes name$ ) \ Check attributes to see if this is a directory @@ -438,6 +445,7 @@ r> close-dev ( path$2 ) $open-file ; +' $create-file to _ofcreate internal Modified: ofw/core/ofwfw.fth =================================================================== --- ofw/core/ofwfw.fth 2007-08-03 00:55:32 UTC (rev 521) +++ ofw/core/ofwfw.fth 2007-08-03 00:57:32 UTC (rev 522) @@ -76,10 +76,30 @@ \ succeeds, returns the addresses of routines to perform I/O on the \ open file and true. If the operation fails, returns false. + +defer _ofcreate +: null-create ( name -- 0 ) 2drop 0 ; +' null-create to _ofcreate + +defer _ofdelete +' 2drop to _ofdelete + : _ofopen ( name mode -- [ fid mode sizeop alignop closeop writeop readop ] okay? ) - >r count open-dev - dup 0= if r> 2drop false exit then ( fid ) + >r count ( name$ r: mode ) + r@ create-flag and if ( name$ r: mode ) + 2dup ['] _ofdelete catch if 2drop then ( name$ r: mode ) + then ( name$ r: mode ) + + 2dup open-dev ?dup 0= if ( name$ r: mode ) + r@ r/o = if ( name$ r: mode ) + 0 ( name$ 0 r: mode ) + else ( name$ r: mode ) + 2dup _ofcreate ( name$ ih r: mode ) + then ( name$ ih r: mode ) + ?dup 0= if r> 3drop false exit then ( name$ ih r: mode ) + then ( name$ ih r: mode ) + nip nip ( ih r: mode ) r@ ['] _ofsize ['] _dfalign ['] _ofclose ['] _ofseek r@ r/o = if ['] nullwrite else ['] _ofwrite then r> w/o = if ['] nullread else ['] _ofread then

1 0

r521 - cpu/ppc cpu/ppc/olpc cpu/x86 cpu/x86/pc/biosload cpu/x86/pc/lxdevel cpu/x86/pc/olpc forth/lib
by svn＠openbios.org 03 Aug '07

03 Aug '07

Author: wmb Date: 2007-08-03 02:55:32 +0200 (Fri, 03 Aug 2007) New Revision: 521 Modified: cpu/ppc/basefw.bth cpu/ppc/builder.bth cpu/ppc/loadmach.fth cpu/ppc/olpc/fw.bth cpu/ppc/savefort.fth cpu/ppc/tools.bth cpu/x86/basefw.bth cpu/x86/catchexc.fth cpu/x86/loadmach.fth cpu/x86/pc/biosload/fw.bth cpu/x86/pc/lxdevel/fw.bth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/spiflash.bth cpu/x86/saveexp.fth cpu/x86/savefort.fth cpu/x86/tools.bth forth/lib/filetool.fth Log: Deleted the last (I hope) vestiges of the long-obsolete "pstr" format for save-forth and some file creation operators. Modified: cpu/ppc/basefw.bth =================================================================== --- cpu/ppc/basefw.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/ppc/basefw.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -85,7 +85,7 @@ [then] [ifndef] no-heads -.( --- Saving basefw.dic --- ) cr "" basefw.dic save-forth +.( --- Saving basefw.dic --- ) cr " basefw.dic" $save-forth [then] \ LICENSE_BEGIN Modified: cpu/ppc/builder.bth =================================================================== --- cpu/ppc/builder.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/ppc/builder.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -8,7 +8,7 @@ fload ${BP}/ofw/tokenizer/tokenize.fth fload ${BP}/forth/lib/builder.fth -.( --- Saving builder.dic --- ) cr "" builder.dic save-forth +.( --- Saving builder.dic --- ) cr " builder.dic" $save-forth \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks Modified: cpu/ppc/loadmach.fth =================================================================== --- cpu/ppc/loadmach.fth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/ppc/loadmach.fth 2007-08-03 00:55:32 UTC (rev 521) @@ -18,7 +18,7 @@ [ifndef] partial-no-heads transient [then] fload ${BP}/forth/lib/binhdr.fth fload ${BP}/cpu/ppc/savefort.fth -\ alias save-forth save-forth +\ alias $save-forth $save-forth [ifndef] partial-no-heads resident [then] fload ${BP}/forth/lib/instdis.fth Modified: cpu/ppc/olpc/fw.bth =================================================================== --- cpu/ppc/olpc/fw.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/ppc/olpc/fw.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -270,7 +270,7 @@ install-rom-cold -.( --- Saving fw.dic ---) cr p" fw.dic" save-forth +.( --- Saving fw.dic ---) cr " fw.dic" $save-forth \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks Modified: cpu/ppc/savefort.fth =================================================================== --- cpu/ppc/savefort.fth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/ppc/savefort.fth 2007-08-03 00:55:32 UTC (rev 521) @@ -1,10 +1,10 @@ purpose: Save the Forth dictionary to a file \ See license at end of file -\ save-forth ( filename -- ) +\ $save-forth ( filename$ -- ) \ Saves the Forth dictionary to a file so it may be later used under Unix \ -\ save-image ( header-adr header-len filename -- ) +\ $save-image ( header-adr header-len filename$ -- ) \ Primitive save routine. Saves the dictionary image to a file. \ The header is placed at the start of the file. The latest definition \ whose name is the same as the "init-routine-name" argument is @@ -30,10 +30,10 @@ loop ( adr ) drop ; -: save-image ( header header-len filename -- ) +: $save-image ( header header-len filename$ -- ) ['] ($find-next) is $find-next - new-file ( header header-len ) + $new-file ( header header-len ) in-little-endian? if ( header header-len ) be-fputs \ Write header origin text-size ?be-fputs \ Write dictionary @@ -62,16 +62,16 @@ ; \ Save an image of the target system in a file. -: save-forth ( str -- ) +: $save-forth ( name$ -- ) 8 (align) \ Make sure image is 8 byte aligned - >r + 2>r make-bin-header " sys-init-io" $find-name is init-io " sys-init" init-save - bin-header /bin-header r> save-image + bin-header /bin-header 2r> $save-image ; only forth also definitions Modified: cpu/ppc/tools.bth =================================================================== --- cpu/ppc/tools.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/ppc/tools.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -21,7 +21,7 @@ fload ${BP}/cpu/ppc/loadmach.fth \ CPU and OS-specific extensions [ifndef] no-heads -.( --- Saving tools.dic --- ) "" tools.dic save-forth cr +.( --- Saving tools.dic --- ) " tools.dic" $save-forth cr [then] \ LICENSE_BEGIN Modified: cpu/x86/basefw.bth =================================================================== --- cpu/x86/basefw.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/basefw.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -106,7 +106,7 @@ [ifndef] no-heads resident dispose 0 0 set-transize \ true is suppress-transient -cr .( --- Saving basefw.dic --- ) "" basefw.dic save-forth cr +cr .( --- Saving basefw.dic --- ) " basefw.dic" $save-forth cr [then] \ LICENSE_BEGIN Modified: cpu/x86/catchexc.fth =================================================================== --- cpu/x86/catchexc.fth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/catchexc.fth 2007-08-03 00:55:32 UTC (rev 521) @@ -360,11 +360,11 @@ ['] noop is uncatch-exceptions ; -: save-forth ( pstr -- ) +: $save-forth ( name$ -- ) ['] uncatch-exceptions behavior ['] (uncatch-exceptions) = if - uncatch-exceptions save-forth catch-exceptions + uncatch-exceptions $save-forth catch-exceptions else - save-forth + $save-forth then ; Modified: cpu/x86/loadmach.fth =================================================================== --- cpu/x86/loadmach.fth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/loadmach.fth 2007-08-03 00:55:32 UTC (rev 521) @@ -19,7 +19,7 @@ [ifndef] partial-no-heads transient [then] fload ${BP}/cpu/x86/saveexp.fth fload ${BP}/cpu/x86/savefort.fth -\ alias save-forth save-forth +\ alias $save-forth $save-forth [ifndef] partial-no-heads resident [then] [ifdef] resident-packages Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/pc/biosload/fw.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -310,7 +310,7 @@ " dhcp" ' ip-address set-config-string-default .( Saving fw.dic ...) -"" fw.dic save-forth cr +" fw.dic" $save-forth cr .( Saving fw.img ...) " fw.img" RAMbase save-abs-rom cr Modified: cpu/x86/pc/lxdevel/fw.bth =================================================================== --- cpu/x86/pc/lxdevel/fw.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/pc/lxdevel/fw.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -510,7 +510,7 @@ previous previous definitions .( --- Saving fw.dic ...) -"" fw.dic save-forth cr +" fw.dic" $save-forth cr \ patch foo decimal cold Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/pc/olpc/fw.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -589,7 +589,7 @@ previous previous definitions .( --- Saving fw.dic ...) -"" fw.dic save-forth cr +" fw.dic" $save-forth cr \ patch foo decimal cold Modified: cpu/x86/pc/olpc/spiflash.bth =================================================================== --- cpu/x86/pc/olpc/spiflash.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/pc/olpc/spiflash.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -70,4 +70,4 @@ alias quit bye -"" spiflash.dic save-forth +" spiflash.dic" $save-forth Modified: cpu/x86/saveexp.fth =================================================================== --- cpu/x86/saveexp.fth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/saveexp.fth 2007-08-03 00:55:32 UTC (rev 521) @@ -48,11 +48,11 @@ checksum 12 hw! \ Checksum ; -: save-image ( pstr base-adr len -- ) - is code-size is code-adr ( pstr ) - makeheader ( pstr ) +: $save-image ( name$ base-adr len -- ) + is code-size is code-adr ( name$ ) + makeheader ( name$ ) - new-file + $new-file exp-header /exp-header ofd @ fputs code-adr code-size ofd @ fputs Modified: cpu/x86/savefort.fth =================================================================== --- cpu/x86/savefort.fth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/savefort.fth 2007-08-03 00:55:32 UTC (rev 521) @@ -3,8 +3,8 @@ only forth also definitions -: save-forth ( pstr -- ) - " sys-init-io" $find-name is init-io ( pstr ) +: $save-forth ( name$ -- ) + " sys-init-io" $find-name is init-io ( name$ ) " sys-init" init-save ['] noop is set-relocation-bit \ Turn off until relo map is allocated @@ -12,9 +12,9 @@ origin origin h# 1c + le-l! \ Set relocation base address \ Set user initialization table - up@ init-user-area origin + user-size move ( pstr ) + up@ init-user-area origin + user-size move ( name$ ) - origin here over - save-image + origin here over - $save-image ; only forth also definitions Modified: cpu/x86/tools.bth =================================================================== --- cpu/x86/tools.bth 2007-08-03 00:47:34 UTC (rev 520) +++ cpu/x86/tools.bth 2007-08-03 00:55:32 UTC (rev 521) @@ -38,7 +38,7 @@ \ .( zeroed: ) dot ' noop is include-hook ' noop is include-exit-hook -.( --- Saving tools.dic --- ) "" tools.dic save-forth cr +.( --- Saving tools.dic --- ) " tools.dic" $save-forth cr [then] \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: forth/lib/filetool.fth =================================================================== --- forth/lib/filetool.fth 2007-08-03 00:47:34 UTC (rev 520) +++ forth/lib/filetool.fth 2007-08-03 00:55:32 UTC (rev 521) @@ -38,6 +38,8 @@ ofd ! ( name$ ) 2drop ; +: modifying ( "filename" -- ) safe-parse-word $write-open ; + : $new-file ( name$ -- ) 2dup r/w create-file if ( name$ x ) drop ." Can't create " type cr abort @@ -71,15 +73,6 @@ note-string 2drop \ Mark as a sequence of bytes ; -\ Backwards compatibility ... - -: read-open ( name-pstr -- ) count $read-open ; -: write-open ( name-pstr -- ) count $write-open ; -: new-file ( name-pstr -- ) count $new-file ; -: append-open ( name-pstr -- ) count $append-open ; -: file-exists? ( name-pstr -- flag ) \ True if the named file already exists - read fopen ( fd ) dup if fclose true then -; \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r520 - clients/memtest86
by svn＠openbios.org 03 Aug '07

03 Aug '07

Author: wmb Date: 2007-08-03 02:47:34 +0200 (Fri, 03 Aug 2007) New Revision: 520 Modified: clients/memtest86/Makefile Log: memtest86 - Added -fno-stack-protector to default CCFLAGS, so it will compile on e.g. Ubuntu. Modified: clients/memtest86/Makefile =================================================================== --- clients/memtest86/Makefile 2007-08-02 22:14:08 UTC (rev 519) +++ clients/memtest86/Makefile 2007-08-03 00:47:34 UTC (rev 520) @@ -13,7 +13,7 @@ # gcc compiler options, these settings should suffice # CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -#CCFLAGS += -fno-stack-protector +CCFLAGS += -fno-stack-protector AS=as -32

1 0

r519 - ofw/termemu
by svn＠openbios.org 03 Aug '07

03 Aug '07

Author: wmb Date: 2007-08-03 00:14:08 +0200 (Fri, 03 Aug 2007) New Revision: 519 Modified: ofw/termemu/fb16.fth Log: fb16 - Fixed terminal emulator problem with insert-characters and delete-characters. Erase-to-end-of-line left garbage at the right of the screen. Modified: ofw/termemu/fb16.fth =================================================================== --- ofw/termemu/fb16.fth 2007-08-02 21:37:59 UTC (rev 518) +++ ofw/termemu/fb16.fth 2007-08-02 22:14:08 UTC (rev 519) @@ -197,20 +197,20 @@ headerless : move-chars16 ( source-col# dest-col# -- ) - 2dup max #columns swap - ( src dst #chars ) - char-width * -rot \ count is linelength-maxcol# - swap column-adr16 swap column-adr16 ( count src-adr dst-adr ) - char-height 0 do - 3dup rot move ( count src-adr dst-adr ) - swap bytes/line16 + swap bytes/line16 + - loop 2drop drop + 2dup max #columns swap - ( src dst #chars ) + char-width 2* * -rot ( #bytes src dst ) + swap column-adr16 swap column-adr16 ( #bytes src dst ) + char-height 0 do ( #bytes src dst ) + 3dup rot move ( #bytes src dst ) + swap bytes/line16 + swap bytes/line16 + ( #bytes src' dst' ) + loop 3drop ( ) ; : erase-chars16 ( #chars start-col# -- ) - swap char-width * swap - column-adr16 char-height 0 do ( count adr ) - 2dup swap text-background16 fb-fill ( count adr ) - bytes/line16 + - loop 2drop + swap char-width 2* * swap ( #bytes start-col# ) + column-adr16 char-height 0 do ( #bytes adr ) + 2dup swap text-background16 fb-fill ( #bytes adr ) + bytes/line16 + ( #bytes adr' ) + loop 2drop ( ) ; headers : fb16-insert-characters ( #chars -- )

1 0