OpenBIOS August 2007

openbios@openbios.org

12 participants
103 discussions

r556 - cpu/x86/pc/olpc
by svn＠openbios.org 17 Aug '07

17 Aug '07

Author: wmb Date: 2007-08-17 00:14:47 +0200 (Fri, 17 Aug 2007) New Revision: 556 Modified: cpu/x86/pc/olpc/fw.bth Log: Oops, fw.bth was including the IPv6 version of http.fth. Reverted to the IPv4 version. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-08-16 21:00:46 UTC (rev 555) +++ cpu/x86/pc/olpc/fw.bth 2007-08-16 22:14:47 UTC (rev 556) @@ -367,7 +367,7 @@ fload ${BP}/ofw/inet/loadtcp.fth support-package: http - fload ${BP}/ofw/inetv6/http.fth \ HTTP client + fload ${BP}/ofw/inet/http.fth \ HTTP client end-support-package fload ${BP}/ofw/wifi/wifi-cfg.fth @@ -507,7 +507,7 @@ ?start-sound ['] false to interrupt-auto-boot? probe-usb - " nand" $dev-update-flash +\ " nand" $dev-update-flash interpreter-init [ifndef] lx-devel enable-power-button

1 0

r555 - cpu/x86/pc/olpc
by svn＠openbios.org 16 Aug '07

16 Aug '07

Author: wmb Date: 2007-08-16 23:00:46 +0200 (Thu, 16 Aug 2007) New Revision: 555 Modified: cpu/x86/pc/olpc/crypto.fth Log: OLPC crypto - converted interface code to use the simplified version of the C code that just verifies one signature at a time. Modified: cpu/x86/pc/olpc/crypto.fth =================================================================== --- cpu/x86/pc/olpc/crypto.fth 2007-08-16 20:58:17 UTC (rev 554) +++ cpu/x86/pc/olpc/crypto.fth 2007-08-16 21:00:46 UTC (rev 555) @@ -4,6 +4,7 @@ h# c0000 constant crypto-base \ The address the code is linked to run at h# c0000 constant hasher-base \ The address the code is linked to run at +0 [if] variable hashlen d# 128 buffer: hashbuf @@ -17,9 +18,11 @@ hasher-base dup h# 10 - sp-call abort" Hash failed" drop 4drop ( ) hashbuf hashlen @ ; +[then] -h# f value which-hashes -: signature-bad? ( data$ sig$ -- mismatch? ) +0 value hashname +: signature-bad? ( data$ sig$ hashname$ -- mismatch? ) + $cstr to hashname ( data$ sig$ ) " crypto" find-drop-in 0= if 4drop true exit then ( data$ sig$ prog$ ) 2dup crypto-base swap move free-mem ( data$ sig$ ) @@ -28,7 +31,7 @@ swap 2swap swap ( siglen sigadr datalen dataadr r: key$ ) 2r@ swap 2swap ( siglen sigadr keylen keyadr datalen dataadr r: key$ ) - which-hashes + hashname ( siglen sigadr keylen keyadr datalen dataadr hash r: key$ ) crypto-base dup h# 10 - sp-call >r 3drop 4drop r> ( result r: key$ ) 2r> free-mem

1 0

r554 - cpu/x86/pc/olpc dev/olpc/cafenand
by svn＠openbios.org 16 Aug '07

16 Aug '07

Author: wmb Date: 2007-08-16 22:58:17 +0200 (Thu, 16 Aug 2007) New Revision: 554 Modified: cpu/x86/pc/olpc/nandstat.fth dev/olpc/cafenand/badblock.fth Log: Graphical copy-nand - fixed some stack bugs in the support routines. Modified: cpu/x86/pc/olpc/nandstat.fth =================================================================== --- cpu/x86/pc/olpc/nandstat.fth 2007-08-16 20:53:50 UTC (rev 553) +++ cpu/x86/pc/olpc/nandstat.fth 2007-08-16 20:58:17 UTC (rev 554) @@ -50,14 +50,14 @@ h# ff h# ff 0 rgb>565 ( #eblocks color ) 0 rot 0 ?do ( color eblock# ) dup nand-pages/block * " block-bad?" $call-nand 0= if ( color eblock# ) - 2dup swap show-state - 1 - else - 0 - then - swap 1+ swap - +loop - drop + 2dup swap show-state ( color eblock# ) + 1 ( color eblock# increment ) + else ( color eblock# ) + 0 ( color eblock# increment ) + then ( color eblock# increment ) + swap 1+ swap ( color eblock#' increment ) + +loop ( color eblock#' ) + 2drop ; : gshow-written ( eblock# -- ) 0 h# ff 0 rgb>565 show-state ; Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2007-08-16 20:53:50 UTC (rev 553) +++ dev/olpc/cafenand/badblock.fth 2007-08-16 20:58:17 UTC (rev 554) @@ -307,8 +307,8 @@ i pages/eblock / over execute i erase-block then - pages/eblock +loop - exit + pages/eblock +loop ( 'show-bad 'show-erased ) + 2drop exit then ( 'show-bad 'show-erased ) \ If there is no existing bad block table, make one from factory info make-bbt

1 0

r553 - cpu/x86/pc/olpc
by svn＠openbios.org 16 Aug '07

16 Aug '07

Author: wmb Date: 2007-08-16 22:53:50 +0200 (Thu, 16 Aug 2007) New Revision: 553 Modified: cpu/x86/pc/olpc/resume.bth Log: OLPC resume - turned off "restore-usb-power", so the kernel is completely in charge of USB during suspend/resume. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-08-16 20:49:15 UTC (rev 552) +++ cpu/x86/pc/olpc/resume.bth 2007-08-16 20:53:50 UTC (rev 553) @@ -21,7 +21,7 @@ \ create save-display create reset-smbus -create restore-usb-power +\ create restore-usb-power h# fe00.0000 constant gp-pa h# fe00.4000 constant dc-pa

1 0

r552 - cpu/x86 cpu/x86/Linux cpu/x86/build forth/lib
by svn＠openbios.org 16 Aug '07

16 Aug '07

Author: wmb Date: 2007-08-16 22:49:15 +0200 (Thu, 16 Aug 2007) New Revision: 552 Modified: cpu/x86/Linux/catchexc.fth cpu/x86/build/builder.dic cpu/x86/cpubpsup.fth cpu/x86/disassem.fth cpu/x86/register.fth forth/lib/stringop.fth Log: Added support for exception handling and breakpointing under Linux. Modified: cpu/x86/Linux/catchexc.fth =================================================================== --- cpu/x86/Linux/catchexc.fth 2007-08-16 18:57:40 UTC (rev 551) +++ cpu/x86/Linux/catchexc.fth 2007-08-16 20:49:15 UTC (rev 552) @@ -3,7 +3,23 @@ decimal only forth also hidden also forth definitions +d# 64 constant #signals + +\ Ideally, we should determine /fpstate at runtime by searching +\ for the "retcode" signature 0077b858 +\ h# 264 constant /fpstate \ Determined empirically by dumping with gdb +h# 26c constant /fpstate \ Determined empirically by dumping with gdb + +\ retcode - 8 +\ extramask - 8 +\ fpstate - 264 +\ sigcontext - 58 +\ signal# - 4 +\ retaddr - 4 + : enterforth + \ Adjust pc if it has been incremented past the trap + int# 3 = if %eip 1- to %eip then handle-breakpoint ; @@ -19,7 +35,7 @@ \ Establish the Data and Return stacks 'user rp0 rp mov - 'user sp0 bx mov + 'user sp0 sp mov \ Restart the Forth interpreter. cld @@ -44,8 +60,8 @@ \ gs, fs, es, ds 00..0c \ edi, esi, ebp, esp, ebx, edx, ecx, eax 10..2c \ trapno, err, eip, cs 30..3c -\ esp_at_signal, ss, *fpstate, oldmask 40..4c -\ cr2 50 +\ eflags, esp_at_signal, ss, *fpstate 40..4c +\ oldmask, cr2 50..54 label save-state-signal @@ -56,29 +72,30 @@ 0 [dx] up mov \ Establish user pointer 'user cpu-state bx mov \ Base address of save area - 4 [sp] si lea \ Address of signal# + sp si mov \ Address of return address cld \ Increment pointers - ax lods ax offset-of int# [bx] mov + ax lods ax offset-of %esp2 [bx] mov + ax lods ax offset-of sig# [bx] mov - ax lods ax offset-of %gs [bx] mov - ax lods ax offset-of %fs [bx] mov - ax lods ax offset-of %es [bx] mov - ax lods ax offset-of %ds [bx] mov + ax lods ax offset-of %gs [bx] mov + ax lods ax offset-of %fs [bx] mov + ax lods ax offset-of %es [bx] mov + ax lods ax offset-of %ds [bx] mov - ax lods ax offset-of %edi [bx] mov - ax lods ax offset-of %esi [bx] mov - ax lods ax offset-of %ebp [bx] mov - ax lods ax offset-of %esp [bx] mov \ Correct ESP value will be set later - ax lods ax offset-of %ebx [bx] mov - ax lods ax offset-of %edx [bx] mov - ax lods ax offset-of %ecx [bx] mov - ax lods ax offset-of %eax [bx] mov + ax lods ax offset-of %edi [bx] mov + ax lods ax offset-of %esi [bx] mov + ax lods ax offset-of %ebp [bx] mov + ax lods ax offset-of %esp [bx] mov \ Correct ESP value will be set later + ax lods ax offset-of %ebx [bx] mov + ax lods ax offset-of %edx [bx] mov + ax lods ax offset-of %ecx [bx] mov + ax lods ax offset-of %eax [bx] mov - ax lods \ Skip trapno + ax lods ax offset-of int# [bx] mov \ trapno ax lods ax offset-of %error [bx] mov \ Save err - ax lods ax offset-of %eip [bx] mov + ax lods ax offset-of %eip [bx] mov \ Change the resume address to go to "reenter" make-odd \ word-align address @@ -90,6 +107,12 @@ ax lods ax offset-of %eflags [bx] mov ax lods \ Skip esp_at_signal ax lods ax offset-of %ss [bx] mov + ax lods \ Skip *fpstate + ax lods ax offset-of %esp1 [bx] mov \ Hijack esp1 for oldmask + ax lods ax offset-of %cr3 [bx] mov \ Hijack cr3 for cr2 + /fpstate # si add \ Skip fpstate + ax lods ax offset-of %ss0 [bx] mov \ Hijack ss0 for extramask0 + ax lods ax offset-of %ss1 [bx] mov \ Hijack ss1 for extramask1 ax ax xor ax dec ax offset-of %state-valid [bx] mov \ mark saved state as valid @@ -118,10 +141,82 @@ ret end-code +h# 400 buffer: restart-stack +0 value restart-sp +code (restart ( -- ) + \ Restore the Forth stacks. + + cld \ Increment pointers + up bx mov \ Save UP because it is di + + \ Data Stack + 'user pssave si mov \ Address of data stack save area + 'user sp0 di mov \ Top of data stack area + + ps-size # di sub \ Bottom of data stack area + ps-size 4 / # cx mov \ Size of data stack area (in longwords) + rep movs + + + \ Return Stack + bx up mov \ Restore UP for 'user + 'user rssave si mov \ Address of return stack save area + 'user rp0 di mov \ Top of return stack area + + rs-size # di sub \ Bottom of return stack area + rs-size 4 / # cx mov \ Size of return stack area (in longwords) + rep movs + + \ Restore registers + + bx up mov \ Restore UP for 'user + 'user cpu-state bx mov \ Base address of save area + + 'user restart-sp sp mov \ Establish a stack for the next steps + + h# 80cd0000 # push \ tail of retcode + h# 0077b858 # push \ retcode - ax pop d# 119 # ax mov h# 80 int + offset-of %ss1 [bx] push \ Actually extramask + offset-of %ss0 [bx] push + /fpstate # sp sub \ Space for fpstate + offset-of %cr3 [bx] push \ Actually cr2 + offset-of %esp1 [bx] push \ Actually oldmask + 0 # push \ *fpstate + offset-of %ss [bx] push \ ss + offset-of %esp [bx] push \ esp_at_signal + offset-of %eflags [bx] push + offset-of %cs [bx] push + offset-of %eip [bx] push + offset-of %error [bx] push + offset-of int# [bx] push \ Actually trapno + + offset-of %eax [bx] push + offset-of %ecx [bx] push + offset-of %edx [bx] push + offset-of %ebx [bx] push + offset-of %esp [bx] push + offset-of %ebp [bx] push + offset-of %esi [bx] push + offset-of %edi [bx] push + + offset-of %ds [bx] push + offset-of %es [bx] push + offset-of %fs [bx] push + offset-of %gs [bx] push + + offset-of sig# [bx] push + offset-of %esp2 [bx] push \ Actually return address + + ret + +end-code +' (restart is restart + + + hidden definitions -d# 65 constant #signals #signals /n* buffer: old-signals defer save-state @@ -179,13 +274,17 @@ ( 08 ) ," Floating point error or divide-by-0" ( 09 ) ," " ( 10 ) ," " -( 11 ) ," " +( 11 ) ," Segmentation fault" end-string-array : (.exception) ( -- ) - int# - dup d# 8 <= if exception-names ". cr exit then - push-decimal (u.) type cr pop-base + sig# 5 = if + int# 3 <> if ." Int 0x" .x then + exit + then + + sig# d# 11 <= if sig# exception-names ". cr exit then + push-decimal sig# (u.) type cr pop-base ; ' (.exception) is .exception : print-breakpoint @@ -199,7 +298,9 @@ hidden also : sys-init sys-init + restart-stack h# 400 + to restart-sp catch-signals + false to hardware-step? restartable? off ; only forth also definitions Modified: cpu/x86/build/builder.dic =================================================================== (Binary files differ) Modified: cpu/x86/cpubpsup.fth =================================================================== --- cpu/x86/cpubpsup.fth 2007-08-16 18:57:40 UTC (rev 551) +++ cpu/x86/cpubpsup.fth 2007-08-16 20:49:15 UTC (rev 552) @@ -50,12 +50,30 @@ then ( adr'' ) sizes r> + c@ + ( adr''' ) \ Add displacement ; + \ Looks for call instructions and figures out the length of their \ addressing mode bytes. Returns the address following those addressing \ mode bytes, or step-adr if the instruction is not a call or if following- \ jsrs is true. -: next-instruction ( following-jsrs? -- adr 0 ) - 0= if +true value hardware-step? \ True if the environment permits hardware single-step +: find-successors ( -- pc1 pc2 ) + hardware-step? if step-adr 0 exit then + + ['] cr behavior >r ['] type behavior >r + ['] noop to cr ['] 2drop to type + [ also disassembler ] %eip pc!dis1 pc @ branch-target @ [ previous ] + r> to type r> to cr +; + +: next-instruction ( following-jsrs? -- next-adr 0|branch_target ) + if + \ We are following jsrs, so we want the target address + \ of call instructions. + find-successors ( adr1 adr2 ) + else + \ We are not following jsrs, so we want the address right after + \ the instruction, not the address within the called subroutine. + %eip dup 1+ swap c@ ( %eip opcode ) case ( %eip+1 opcode ) h# 0cc of 0 exit endof \ INT 3 @@ -71,8 +89,8 @@ endof endcase ( %eip+1 ) drop ( ) - then ( ) - step-adr 0 + find-successors ( adr1 adr2 ) + then ( adr1 adr2 ) ; code goto ( adr -- ) @@ -84,7 +102,7 @@ true abort" loop-exit-adr is not implemented" ; -: bumppc ( -- ) 0 next-instruction to rpc ; +: bumppc ( -- ) 0 next-instruction drop to rpc ; only forth also definitions headers : set-pc ( adr -- ) dup to rpc ; Modified: cpu/x86/disassem.fth =================================================================== --- cpu/x86/disassem.fth 2007-08-16 18:57:40 UTC (rev 551) +++ cpu/x86/disassem.fth 2007-08-16 20:49:15 UTC (rev 552) @@ -14,6 +14,7 @@ nuser instruction variable end-found nuser pc +nuser branch-target nuser dis-offset : op8@ ( -- b ) pc @ dis-offset @ + c@ 1 pc +! ; @@ -185,8 +186,8 @@ ," s" ," ns" ," pe" ," po" ," l" ," ge" ," le" ," g" end-string-array -: jb ( -- ) op8@ bext pc @ + showaddr ; -: jv ( -- ) adv@ pc @ + showaddr ; +: jb ( -- ) op8@ bext pc @ + dup branch-target ! showaddr ; +: jv ( -- ) adv@ pc @ + dup branch-target ! showaddr ; : .jcc ( -- ) ." j" low4bits >cond ". op-col jb ; : ea,g ( -- ) get-ea .ea ., gb/v ; @@ -573,7 +574,7 @@ .op8 .op9 .opa .movi .opc .opd .ope .opf ; -: (dis-body) ( -- ) decode-op op-class ; +: (dis-body) ( -- ) branch-target off decode-op op-class ; ' (dis-body) is dis-body : dis1 ( -- ) ??cr Modified: cpu/x86/register.fth =================================================================== --- cpu/x86/register.fth 2007-08-16 18:57:40 UTC (rev 551) +++ cpu/x86/register.fth 2007-08-16 20:49:15 UTC (rev 552) @@ -63,7 +63,7 @@ \ State information needed by the firmware; not machine registers register watchdog register %state-valid register %restartable? -register %saved-my-self register last-trap# +register %saved-my-self register sig# \ Following words defined here to satisfy the \ references to these "variables" anywhere else Modified: forth/lib/stringop.fth =================================================================== --- forth/lib/stringop.fth 2007-08-16 18:57:40 UTC (rev 551) +++ forth/lib/stringop.fth 2007-08-16 20:49:15 UTC (rev 552) @@ -35,9 +35,9 @@ vocabulary macros : $set-macro ( value$ name$ -- ) - warning @ warning off + warning @ >r warning off also macros definitions $header create-cf previous definitions ( value$ ) - warning ! + r> warning ! ", does> ( -- adr len ) count ;

1 0

r551 - ofw/inetv6
by svn＠openbios.org 16 Aug '07

16 Aug '07

Author: lwalter Date: 2007-08-16 20:57:40 +0200 (Thu, 16 Aug 2007) New Revision: 551 Modified: ofw/inetv6/dns.fth Log: Fix dns IPv4/IPv6 resolution order Modified: ofw/inetv6/dns.fth =================================================================== --- ofw/inetv6/dns.fth 2007-08-16 18:54:10 UTC (rev 550) +++ ofw/inetv6/dns.fth 2007-08-16 18:57:40 UTC (rev 551) @@ -284,8 +284,8 @@ false value resolve-flag : resolvev4 ( hostname$ -- ) false to resolve-flag - 2dup ['] resolve-a catch if 2drop else true to resolve-flag set-dest-ip then - ['] resolve-aaaa catch if 2drop else true to resolve-flag then + 2dup ['] resolve-aaaa catch if 2drop else true to resolve-flag then + ['] resolve-a catch if 2drop else true to resolve-flag set-dest-ip then resolve-flag not abort" DNS: No answer" ;

1 0

r550 - forth/wrapper
by svn＠openbios.org 16 Aug '07

16 Aug '07

Author: wmb Date: 2007-08-16 20:54:10 +0200 (Thu, 16 Aug 2007) New Revision: 550 Modified: forth/wrapper/wrapper.c Log: wrapper.c - deleted support for obsolete systems - MAJC process and OSF1 OS. Modified: forth/wrapper/wrapper.c =================================================================== --- forth/wrapper/wrapper.c 2007-08-16 18:53:12 UTC (rev 549) +++ forth/wrapper/wrapper.c 2007-08-16 18:54:10 UTC (rev 550) @@ -174,12 +174,6 @@ char *host_cpu = "x86"; #endif -#ifdef OSF1 -char *host_os = "osf1"; -char *host_cpu = "alpha"; -#endif - - #ifdef TARGET_POWERPC char *target_cpu = "powerpc"; #ifndef LinuxPOWERPC @@ -202,12 +196,6 @@ #define START_OFFSET 0 #endif -#ifdef MAJC -char *target_cpu = "majc"; -#define CPU_MAGIC 0x03a00008 -#define START_OFFSET 0 -#endif - #ifdef ALPHA char *target_cpu = "alpha"; #define CPU_MAGIC 0xc3e00007 @@ -232,12 +220,7 @@ #include <errno.h> -/* Is OSF/1 the only build environment where a long is 64 bits? */ -#ifdef OSF1 -typedef int quadlet; -#else typedef long quadlet; -#endif #ifdef WIN32 #include <windows.h> @@ -291,17 +274,13 @@ extern void _sync_cache_range(char *, long); #endif -#ifdef OSF1 -#undef BSD -#endif - #ifdef UNIX INTERNAL void exit_handler(); -#ifdef BSD +# ifdef BSD INTERNAL void cont_handler(); INTERNAL void stop_handler(); +# endif #endif -#endif #ifdef WIN32 #define isatty _isatty @@ -395,7 +374,7 @@ #ifdef JTAG #include "jtag.h" #endif -#if defined (BSD) || defined(OSF1) || defined (LinuxX86) +#if defined (BSD) || defined (__linux__) INTERNAL long s_timeofday(); #endif #if defined(USE_TERMIOS) @@ -500,7 +479,7 @@ /* 268 .. 344 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, #endif -#if defined(BSD) || defined(OSF1) || defined(LinuxX86) +#if defined(BSD) || defined(__linux__) /* 348 */ s_timeofday, #else @@ -781,10 +760,6 @@ char **argv, *envp; { char * loadaddr; -#ifdef LinuxX86 - unsigned char * pc; - unsigned char pcb; -#endif long f; long dictsize, extrasize, imagesize, memsize, relsize; int extrak; @@ -949,10 +924,6 @@ if (header.h_magic != CPU_MAGIC) { error("forth: Incorrect dictionary file header in ", dictfile); /* XXX */ printf("%x %x\n", CPU_MAGIC, header.h_magic); -#ifdef LinuxX86 -pc = (char *)&header.h_magic; -pcb = pc[0]; -#endif exit(1); } @@ -981,14 +952,7 @@ printf("Copyright 1994 FirmWorks All rights reserved\n"); # endif -# ifdef MAJC - /* The code wad must be aligned on a 64K boundary because of the - * way that call instructions work in MAJC */ - loadaddr = (char *)m_alloc(dictsize + 0x10020); - loadaddr = (char *)(((((int)loadaddr + 0x10020)) & ~0xffff) - 0x20); -# else loadaddr = (char *)m_alloc(dictsize); -# endif if ((loadaddr == (char *) -1) || (loadaddr == (char *) 0)) { error("forth: Can't get memory",""); exit(1); @@ -1015,7 +979,6 @@ keymode(); -#ifdef MAJC #ifdef UNIX signal(SIGHUP,exit_handler); signal(SIGINT,exit_handler); @@ -1025,28 +988,21 @@ signal(SIGFPE,exit_handler); signal(SIGBUS,exit_handler); signal(SIGSEGV,exit_handler); -#ifndef __linux__ +# ifndef __linux__ signal(SIGEMT,exit_handler); signal(SIGSYS,exit_handler); -#endif -#ifdef BSD +# endif +# ifdef BSD signal(SIGCONT,cont_handler); signal(SIGTSTP,stop_handler); +# endif #endif -#endif -#endif /* * Call the Forth interpreter as a subroutine. If it returns, * exit with its return value as the status code. */ -#ifdef MAJC - s_bye((*(long (*) ())(loadaddr+sizeof(header)+START_OFFSET)) - (loadaddr, functions, ((long)loadaddr+dictsize - 16) & ~15, - argc, argv)); -#endif - #ifdef PPCSIM simulate(0L, loadaddr+sizeof(header)+START_OFFSET, loadaddr, functions, ((long)loadaddr+dictsize - 16) & ~15, @@ -1168,6 +1124,9 @@ exit_handler(sig) int sig; { + printf("Mama\n"); + while (1) ; + #ifdef HAVE_PSIGNAL psignal(sig, "forth"); #else @@ -1237,14 +1196,6 @@ int nchars = 0; fflush(stdout); -#ifdef MAJC - if ( (nchars = stdin->_r) == 0 ) { - keyqmode(); - nchars = read(0, &c, 1) > 0; - if (nchars) - ungetc(c[0], stdin); - } -#else # ifdef UNIX # ifdef SYS5 # ifdef __linux__ @@ -1273,7 +1224,6 @@ # endif #endif return ((long)nchars); -#endif } /* @@ -1408,40 +1358,45 @@ initline() { if (lmode != M_ORIG) return; -#ifndef MAJC #ifdef USE_TERMIOS tcgetattr(0, &ostate); /* save old state */ tcgetattr(0, &lstate); /* base of line state */ lstate.c_iflag |= IXON|IXANY|IXOFF; /* XON/XOFF */ lstate.c_iflag |= ICRNL; /* CR/NL munging */ -#ifdef IUCLC + +# ifdef IUCLC lstate.c_iflag &= ~(IUCLC); /* no case folding */ -#endif -#ifndef AIX +# endif + +# ifndef AIX lstate.c_oflag |= OPOST|ONLCR; /* Map NL to CR-LF */ -#ifdef ILCUC +# ifdef ILCUC lstate.c_oflag &= ~(OLCUC); /* No case folding */ -#endif +# endif lstate.c_oflag &= ~(OCRNL|ONLRET); /* Don't swap cr and lf */ -#endif +# endif + lstate.c_lflag |= ICANON|ECHO; /* Line editing on */ lstate.c_cc[VMIN] = 1; /* Don't hold up input */ lstate.c_cc[VTIME] = 0; /* No input delay */ tcgetattr(0, &kstate); /* base of key state */ kstate.c_iflag &= ~(IXON|IXANY|IXOFF); /* no XON/XOFF */ -#ifdef IUCLC + +# ifdef IUCLC kstate.c_iflag &= ~(IUCLC); /* no case folding */ -#endif -#ifndef AIX +# endif + +# ifndef AIX kstate.c_iflag &= ~(INLCR|ICRNL); /* no CR/NL munging */ kstate.c_oflag |= OPOST|ONLCR; /* Map NL to CR-LF */ -#ifdef OLCUC +# ifdef OLCUC kstate.c_oflag &= ~(OLCUC); /* No case folding */ -#endif +# endif kstate.c_oflag &= ~(OCRNL|ONLRET); /* Don't swap cr and lf */ -#endif +# endif + kstate.c_lflag &= ~(ICANON|ECHO); /* No editing characters */ kstate.c_cc[VMIN] = 1; /* Don't hold up input */ kstate.c_cc[VTIME] = 0; /* No input delay */ @@ -1449,6 +1404,7 @@ kqstate = kstate; kqstate.c_cc[VMIN] = 0; /* Poll for character */ #endif + #ifdef USE_STTY ioctl(0, TIOCGETP, &ostate); /* save old state */ @@ -1460,27 +1416,6 @@ kstate.sg_flags |= CBREAK; /* Wake up on each char */ kstate.sg_flags &= ~ECHO; /* Don't echo */ #endif -#else -#ifdef notnow - tcgetattr(0, &ostate); /* save old state */ - tcgetattr(0, &lstate); /* base of line state */ - lstate.c_iflag |= IXON|IXOFF; /* XON/XOFF */ - lstate.c_iflag |= ICRNL; /* CR/NL munging */ - lstate.c_oflag |= OPOST; /* */ - lstate.c_lflag |= ICANON|ECHO; /* Line editing on */ - lstate.c_cc[VMIN] = 1; /* Don't hold up input */ - lstate.c_cc[VTIME] = 0; /* No input delay */ - tcgetattr(0, &kstate); /* base of key state */ - kstate.c_iflag &= ~(IXON|IXOFF); /* no XON/XOFF */ - kstate.c_iflag &= ~(INLCR|ICRNL); /* no CR/NL munging */ - kstate.c_oflag |= OPOST; /* */ - kstate.c_lflag &= ~(ICANON|ECHO); /* No editing characters */ - kstate.c_cc[VMIN] = 1; /* Don't hold up input */ - kstate.c_cc[VTIME] = 0; /* No input delay */ - kqstate = kstate; - kqstate.c_cc[VMIN] = 0; /* Poll for character */ -#endif -#endif } INTERNAL linemode() @@ -1513,18 +1448,7 @@ } #endif -#ifdef MAJC INTERNAL void -keyqmode() -{ - initline(); - if (lmode != M_KEYQ) { - lmode = M_KEYQ; - } -} -#endif - -INTERNAL void keymode() { initline(); @@ -1876,9 +1800,6 @@ f_mkdir(name) char *name; { -#ifdef MAJC - return(-1); -#else #ifdef DEMON return(-1); /* XXX fixme */ #else @@ -1888,22 +1809,17 @@ #endif )); #endif -#endif } INTERNAL long f_rmdir(name) char *name; { -#ifdef MAJC - return(-1); -#else #ifdef DEMON return(-1); /* XXX fixme */ #else return((long)rmdir(expand_name(name))); #endif -#endif } INTERNAL long @@ -1981,12 +1897,8 @@ char *buf; { #ifdef UNIX -#ifndef MAJC return((long)ioctl((int)fd, (int)code, buf)); #else - return(0); -#endif -#else return((long)-1); #endif } @@ -2029,7 +1941,6 @@ s_system(str) char *str; { -#ifndef MAJC int i; char *cmd; @@ -2048,7 +1959,6 @@ keymode(); return ((long)i); -#endif } /* @@ -2274,10 +2184,7 @@ INTERNAL long timez() { -#ifdef MAJC - return(0); -#endif -#if defined(BSD) || defined(OSF1) +#if defined(BSD) static struct timeval t; static struct timezone tz; extern int gettimeofday(); @@ -2304,7 +2211,7 @@ #endif } -#if defined(BSD) || defined(OSF1) || defined(LinuxX86) +#if defined(BSD) || defined(__linux__) INTERNAL long s_timeofday() {

1 0

r549 - cpu/x86 ofw/tokenizer
by svn＠openbios.org 16 Aug '07

16 Aug '07

Author: wmb Date: 2007-08-16 20:53:12 +0200 (Thu, 16 Aug 2007) New Revision: 549 Modified: cpu/x86/builder.bth ofw/tokenizer/tokenize.fth Log: Deleted a couple more vestiges of the pstr format, thus completing (I hope) the job begun by r521. Modified: cpu/x86/builder.bth =================================================================== --- cpu/x86/builder.bth 2007-08-15 22:59:54 UTC (rev 548) +++ cpu/x86/builder.bth 2007-08-16 18:53:12 UTC (rev 549) @@ -7,4 +7,4 @@ fload ${BP}/ofw/tokenizer/tokenize.fth \ Tokenizer fload ${BP}/forth/lib/builder.fth \ Builder -.( --- Saving builder.dic --- ) "" builder.dic save-forth cr +.( --- Saving builder.dic --- ) " builder.dic" $save-forth cr Modified: ofw/tokenizer/tokenize.fth =================================================================== --- ofw/tokenizer/tokenize.fth 2007-08-15 22:59:54 UTC (rev 548) +++ ofw/tokenizer/tokenize.fth 2007-08-16 18:53:12 UTC (rev 549) @@ -1226,7 +1226,7 @@ init-vars init-path - save$3 new-file ( ) + save$3 count $new-file ( ) aout-header? @ if write-header then ( ) \ Save the current stack depth

1 0

r548 - ofw/inetv6
by svn＠openbios.org 16 Aug '07

16 Aug '07

Author: lwalter Date: 2007-08-16 00:59:54 +0200 (Thu, 16 Aug 2007) New Revision: 548 Added: ofw/inetv6/dhcpv6.fth Modified: ofw/inetv6/dns.fth ofw/inetv6/dnsv6.fth ofw/inetv6/ethernet.fth ofw/inetv6/icmpinfo.fth ofw/inetv6/loadpkg.fth ofw/inetv6/neighdis.fth ofw/inetv6/tcpv6.fth Log: Fix a couple of page fault bugs; Add IPv6 DNS support using tubes.laptop.org Added: ofw/inetv6/dhcpv6.fth =================================================================== --- ofw/inetv6/dhcpv6.fth (rev 0) +++ ofw/inetv6/dhcpv6.fth 2007-08-15 22:59:54 UTC (rev 548) @@ -0,0 +1,60 @@ +\ See license at end of file +purpose: Dynamic Host Configuration Protocol for IPv6 (DHCPv6) (RFC 3315) + +[ifndef] include-ipv4 +d# 256 buffer: 'root-path +d# 256 buffer: 'client-name +d# 256 buffer: 'vendor-options +headers +' 'client-name " client-name" chosen-string +' 'vendor-options " vendor-options" chosen-string +' 'root-path " root-path" chosen-string +: domain-name ( -- adr len ) 'domain-name cscount ; +[then] + +\ tubes.laptop.org +create default-name-server-ipv6 h# 20 c, 1 c, h# 48 c, h# 30 c, h# 24 c, h# 46 c, h# ff c, 0 c, 0 l, 0 w, 0 c, 1 c, + +: init-dhcpv6 ( -- ) +[ifndef] include-ipv4 + 0 'domain-name c! + 0 'root-path c! + 0 'client-name c! + 0 'vendor-options c! +\ 0 file-name-buf c! +[then] + default-name-server-ipv6 name-server-ipv6 copy-ipv6-addr +; + +also forth definitions +stand-init: DHCPv6 init + init-dhcpv6 +; +previous definitions + +: do-dhcp ( -- ) +; + +\ 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 Modified: ofw/inetv6/dns.fth =================================================================== --- ofw/inetv6/dns.fth 2007-08-15 20:20:01 UTC (rev 547) +++ ofw/inetv6/dns.fth 2007-08-15 22:59:54 UTC (rev 548) @@ -244,6 +244,7 @@ [ifdef] include-ipv6 : resolve-aaaa ( hostname$ -- ) + his-ipv6-addr unknown-ipv6-addr? not if 2drop exit then bootnet-debug if ( hostname$ ) ." Using DNS AAAA to find the IPv6 address of " ( hostname$ ) 2dup type cr ( hostname$ ) Modified: ofw/inetv6/dnsv6.fth =================================================================== --- ofw/inetv6/dnsv6.fth 2007-08-15 20:20:01 UTC (rev 547) +++ ofw/inetv6/dnsv6.fth 2007-08-15 22:59:54 UTC (rev 548) @@ -3,38 +3,276 @@ headerless +[ifndef] include-ipv4 +\ struct ( dns header ) +\ /w field >id \ 0 - Number to match questions with answers +\ /w field >dns-flags \ 2 - q/a:8000 opcode:780 aa:40 tc:20 rd:10 ra:8 rc:f +\ /w field >qdcount \ 4 - number of following questions +\ /w field >anscount \ 6 - number of following answer RRs +\ /w field >nscount \ 8 - number of following name server RRs +\ /w field >arccount \ a - number of following additional RRs +\ constant /dns-header + +\ DNS question format: QNAME-variable_length, QTYPE(/w), QCLASS(/w) +\ QTYPE value for "A" (host name) is 1 +\ QTYPE value for "AAAA" (IPv6 hostname) is h# 1c +\ QCLASS value for "IN" (Internet) is 1 + +\ d# 1022 value fw-port# \ It's been assigned by IANA. +h# 800a constant fw-port# \ It's unassigned as of 8/13/2007. + +d# 2000 constant dns-timeout + +2 value #retries-a +2 value #retries-aaaa + +0 value qtype +1 constant qclass + +\ Encode/decode various DNS data types +: +dnsw ( w -- ) wbsplit +xb +xb ; +: -dnsw ( -- w ) -xb -xb swap bwjoin ; +: -dnsl ( -- l ) -dnsw -dnsw swap wljoin ; + +\ A label is a dot-less component of a dotted name. In DNS packets, +\ a label is represented as a length byte followed by the bytes of the string. +: +dns-label ( adr len -- ) dup +xb bounds ?do i c@ +xb loop ; + +\ A name is a full domain name consisting of one or more labels sepearate +\ by dots. In DNS packets, the dots are not included. +: +dns-name ( adr len -- ) + begin dup while + [char] . left-parse-string + +dns-label + repeat + 2drop + 0 +xb +; +: -dnsbytes ( len -- adr len ) + dup x$ over >r ( len len adr rem-len r: adr ) + rot /string to x$ ( len r: adr ) + r> swap ( adr len ) +; + +: +np ( adr len byte -- ) >r 2dup + r> swap c! 1+ ; + +defer -dns-tail \ Forward reference for mutual recursion + +0 instance value dns-header \ Pointer to beginning of DNS header + +\ Handle a compressed name tail, which is represented by a 2-byte +\ offset from the beginning of the DNS header to the beginning of a +\ previous uncompressed copy of the name tail. +: do-ptr ( adr len ptr-offset -- adr len' ) + h# c0 invert and -xb swap bwjoin dns-header + d# 255 ( adr len ) + x$ 2>r to x$ + -dns-tail + 2r> to x$ +; + +\ Handle the next name component, which is either: +\ a) The end of the name, represented by a 0 byte +\ b) A label, represented by a length byte (0-31) followed by the string +\ c) A pointer, represented by pair of bytes "11oooooo oooooooo", where +\ oooooo oooooooo is a 14-bit offset (see do-ptr) +: -component ( adr len -- adr len' end? ) + -xb ?dup 0= if true exit then + dup h# c0 and case + h# c0 of do-ptr true endof + h# 00 of -dnsbytes bounds ?do i c@ +np loop false endof + \ the 80 and 40 cases are reserved + ( default ) ." Unknown DNS label code" cr true swap + endcase +; + +\ Copy the tail of a DNS name from the DNS packet to the buffer adr,len +: (-dns-tail) ( adr len -- adr len' ) + -component if exit then + begin [char] . +np -component until +; +' (-dns-tail) to -dns-tail + +\ Extract a domain name from the DNS packet into a local buffer +d# 256 buffer: dns-name-buf +: -dns-name ( -- adr len ) dns-name-buf 0 -dns-tail ; + +\ Add the host name to the packet and tack on the domain name +\ if it's not already there +: +dns-host ( adr len -- ) + [char] . split-string ( head$ tail$ ) + dup if \ Already fully-qualified ( head$ tail$ ) + nip + +dns-name ( ) + else \ No domain name ( head$ tail$ ) + 2drop +dns-label ( ) + domain-name +dns-name ( ) + then ( ) +; + +d# 512 constant /dns-query +d# 53 constant dns-port# +0 instance value dns-xid + +\ Send a DNS question asking for the IP address for the indicated host +: send-dns-query ( hostname$ -- ) + /dns-query allocate-udp >r + r@ start-encode + next-xid lwsplit drop to dns-xid \ DNS transaction IDs are 16 bits + \ Flags=100 means standard query, recursion desired (100) + \ ID flags #questions #answers #namesrvrs #additional + dns-xid +dnsw h# 100 +dnsw 1 +dnsw 0 +dnsw 0 +dnsw 0 +dnsw + +dns-host + qtype +dnsw qclass +dnsw + x$ fw-port# dns-port# send-udp-packet + r> /dns-query free-udp +; +defer handle-dns-call ' noop is handle-dns-call + +: unexpected-xid ( -- ) + bootnet-debug if + ." (Discarding DNS reply with mismatched transaction ID)" cr + then +; + +\ Receive a DNS reply, filtering out stuff that's not for us +: receive-dns-reply ( xid his-port# my-port# -- error? ) + begin + begin + \ Filter out other destination ports + dup receive-udp-packet if ( xid his mine ) \ Timeout + ." Timeout waiting for DNS reply" cr + 3drop true exit + then ( xid his mine adr len actual-port# ) + \ Filter out other source ports + 4 pick <> while ( xid his mine adr len ) + 2drop ( xid his mine ) + repeat ( xid his mine adr len ) + + over to dns-header ( xid his mine ) + start-decode ( xid his mine ) + + \ Filter out other transaction IDs + 2 pick -dnsw <> if ( xid his mine ) + unexpected-xid false ( xid his mine flag ) + else ( xid his mine ) + \ Filter out DNS calls + -dnsw h# 8000 and 0= if ( xid his mine ) + handle-dns-call false ( xid his mine false ) + else ( xid his mine ) + true ( xid his mine true ) + then ( xid his mine done? ) + then ( xid his mine done? ) + until ( xid his mine ) + 3drop false ( false ) +; + +\ Decode/extract a DNS question section from the DNS packet +: -dns-question ( -- name$ type class ) -dns-name -dnsw -dnsw ; + +\ Discard TTL +: -data ( -- ) -dnsw -dnsbytes 2drop ; +: parse-answer ( -- false | 'ip true ) + -dns-name 2drop + + -dnsw -dnsw wljoin ( class.type ) + -dnsl drop ( class.type ) \ Discard TTL + qtype qclass wljoin = if ( ) + -dnsw drop \ Discard RDLENGTH (it better be 4!) + x$ drop true ( 'ip true ) + else ( ) + -dnsw ( datalen ) + -dnsbytes 2drop false ( false ) + then +; + +\ Decode the reply to a DNS "get IP address for host name" query. +: get-host-addr ( -- 'ip ) + \ Decoder is pointing at the QDCOUNT field + + -dnsw -dnsw ( #questions #answers ) + -dnsw drop -dnsw drop \ Discard NSCOUNT and ARCOUNT + + \ Discard echoed questions + swap 0 ?do -dns-question 2drop 2drop loop ( #answers ) + + 0 ?do parse-answer if unloop exit then loop ( ) + 4 throw +; + +headers +\ Return in the buffer 'ip the IP address address for named host. +\ The host name can be either a simple name (e.g. "pi") or a +\ fully-qualified domain name (e.g. "pi.firmworks.com"). +: try-resolve ( hostname$ -- 'ip ) + dns-timeout set-timeout ( hostname$ ) + send-dns-query ( ) + dns-xid dns-port# fw-port# receive-dns-reply ( error? ) + 1 and throw ( ) + get-host-addr ( answer-ip ) +; +[then] + +headerless + /ipv6 buffer: ipv6-buf [ifndef] include-ipv4 : $>ip ( hostname$ -- 'ip ) .ipv4-not-supported ; : resolvev4 ( hostname$ -- ) .ipv4-not-supported ; +: (set-dest-ip) ( buf -- ) .ipv4-not-supported ; : set-dest-ip ( buf -- ) .ipv4-not-supported ; : ?bad-ip ( flag -- ) abort" Bad host name or address" ; [then] : resolvev6 ( hostname$ -- ) + bootnet-debug if ( hostname$ ) + ." Using IPv6 DNS to find the IPv6 address of " ( hostname$ ) + 2dup type cr ( hostname$ ) + then + true to use-ipv6? - unknown-ipv6-addr his-ipv6-addr copy-ipv6-addr - abort" IPv6 DNS not supported yet" + h# 1c to qtype + name-server-ipv6 set-dest-ipv6 + 2dup ['] try-resolve catch ?dup if ( hostname$ x x err ) + nip nip ( hostname$ err ) + 1 <> if ( hostname$ ) + bootnet-debug if + indent ." Unknown IPv6 hostname: " 2dup type cr + then + true abort" Unknown IPv6 hostname" + then + else + bootnet-debug if + indent ." Got IPv6 address " dup .ipv6 cr + then + set-dest-ipv6 + 2drop exit + then + + bootnet-debug if indent ." No answer to IPv6 DNS request" cr then + true abort" IPv6 DNS: No answer" ; headers -\ XXX Try (resolve) or (resolve6) first. If fail, try the other one. -: (resolve) ( hostname$ -- ) +: resolve ( hostname$ -- ) 2dup ['] resolvev6 catch if 2drop + unknown-ipv6-addr his-ipv6-addr copy-ipv6-addr + then + use-ipv6-ok? not if \ IPv6 DNS fail, try DNS false to use-ipv6? resolvev4 else 2drop then - use-ipv6-ok? dup to use-ipv6? if \ Make sure all the addresses are set properly + use-ipv6-ok? dup to use-ipv6? if \ Make sure all the addresses are set properly his-ipv6-addr (set-dest-ipv6) bootnet-debug if ." Use IPv6 protocol" cr then else +[ifdef] include-ipv4 his-ip-addr (set-dest-ip) bootnet-debug if ." Use IP protocol" cr then +[then] then ; @@ -42,7 +280,7 @@ dup 0= ?bad-ip 2dup ['] $>ip catch if 2drop else false to use-ipv6? set-dest-ip 2drop exit then 2dup ipv6-buf ['] $ipv6# catch if - 3drop (resolve) + 3drop resolve else 2drop true to use-ipv6? ipv6-buf set-dest-ipv6 Modified: ofw/inetv6/ethernet.fth =================================================================== --- ofw/inetv6/ethernet.fth 2007-08-15 20:20:01 UTC (rev 547) +++ ofw/inetv6/ethernet.fth 2007-08-15 22:59:54 UTC (rev 548) @@ -53,6 +53,12 @@ create broadcast-en-addr h# ff c, h# ff c, h# ff c, h# ff c, h# ff c, h# ff c, : unknown-en-addr? ( 'en -- flag ) dup l@ 0= swap w@ 0= and ; +: known-en-addr? ( 'en -- flag ) + >r + r@ unknown-en-addr? + r@ broadcast-en-addr en= or + r@ c@ h# 33 = r> 1+ c@ h# 33 = and or not +; decimal @@ -119,7 +125,9 @@ th 86dd constant IPV6_TYPE hex -: ip-type? ( type -- ip-type? ) dup IP_TYPE = swap IPV6_TYPE = or ; +: ip-type? ( type -- ip-type? ) + use-ipv6? if IPV6_TYPE else IP_TYPE then = +; : eth-type=? ( type -- flag ) eth-type ip-type? if ip-type? else eth-type = then Modified: ofw/inetv6/icmpinfo.fth =================================================================== --- ofw/inetv6/icmpinfo.fth 2007-08-15 20:20:01 UTC (rev 547) +++ ofw/inetv6/icmpinfo.fth 2007-08-15 22:59:54 UTC (rev 548) @@ -9,7 +9,10 @@ \ ****************** Neighbor Discovery and Autoconfiguration ****************** : handle-router-sol ( adr len -- ) 2drop ; \ Router solicitation -: handle-router-ad ( adr len -- ) 2drop ; \ Router advertisement +: handle-router-ad ( adr len -- ) \ Router advertisement + bootnet-debug if ." Router advertisement" cr then + 2drop +; : send-router-sol ( -- ) 8 allocate-icmpv6 set-struct \ Option: source link-layer addr @@ -53,7 +56,7 @@ ( 'ip ) icmp-data copy-ipv6-addr h# 201 icmp-data /ipv6 + xw! \ Option type 2 (target mac addr) \ Length (in 8 octels) - my-en-addr icmp-data /ipv6 + 2 + copy-ipv6-addr + my-en-addr icmp-data /ipv6 + 2 + copy-en-addr hop-limit >r h# ff to hop-limit \ Save and change hop-limit the-struct d# 24 2dup send-icmpv6-packet @@ -61,6 +64,7 @@ r> to hop-limit \ Restore hop-limit ; +/e buffer: his-en-addr-save /ipv6 buffer: his-ipv6-addr-save /ipv6 buffer: my-ipv6-addr-save : handle-neigh-sol ( adr len -- ) \ Neighbor solicitation @@ -74,21 +78,29 @@ 2drop exit then - \ XXX Send Neighbor Advertisement + \ Send Neighbor Advertisement drop ( adr ) - his-ipv6-addr his-ipv6-addr-save copy-ipv6-addr \ Save his-ipv6-addr + his-ipv6-addr his-ipv6-addr-save copy-ipv6-addr \ Save his-*-addr my-ipv6-addr my-ipv6-addr-save copy-ipv6-addr + his-en-addr his-en-addr-save copy-en-addr ipv6-dest-addr c@ dup h# ff = swap h# fe = or if my-ipv6-addr-link-local else my-ipv6-addr-global then my-ipv6-addr copy-ipv6-addr - ipv6-source-addr his-ipv6-addr copy-ipv6-addr \ Use the solicitor's IPv6 addr as dst + ipv6-source-addr his-ipv6-addr copy-ipv6-addr \ Use solicitor's IPv6 addr as dst + dup /icmp-header + /ipv6 + 2 + his-en-addr copy-en-addr \ Use solicitor's mac addr as dst /icmp-header + true send-neigh-ad - his-ipv6-addr-save his-ipv6-addr copy-ipv6-addr \ Restore his-ipv6-addr + his-ipv6-addr-save his-ipv6-addr copy-ipv6-addr \ Restore his-*-addr my-ipv6-addr-save my-ipv6-addr copy-ipv6-addr + his-en-addr-save his-en-addr copy-en-addr ; -: handle-neigh-ad ( adr len -- ) 2drop ; \ Neighbor advertisement +: handle-neigh-ad ( adr len -- ) \ Neighbor advertisement + bootnet-debug if + ." Neighbor advertisement from MAC: " over d# 26 + .enaddr cr + then + 2drop +; : handle-inv-neigh-sol ( adr len -- ) 2drop ; \ Inverse neighbor discovery solicitation : handle-inv-neigh-ad ( adr len -- ) 2drop ; \ Inverse neighbor discovery advertisement Modified: ofw/inetv6/loadpkg.fth =================================================================== --- ofw/inetv6/loadpkg.fth 2007-08-15 20:20:01 UTC (rev 547) +++ ofw/inetv6/loadpkg.fth 2007-08-15 22:59:54 UTC (rev 548) @@ -43,7 +43,7 @@ [then] [ifdef] include-ipv6 \ fload ${BP}/ofw/inetv6/bootpv6.fth \ Bootp Protocol -\ fload ${BP}/ofw/inetv6/dhcpv6.fth \ Dynamic Host Config. Protocol +fload ${BP}/ofw/inetv6/dhcpv6.fth \ Dynamic Host Config. Protocol fload ${BP}/ofw/inetv6/tftp.fth \ Trivial File Transfer Protocol fload ${BP}/ofw/inetv6/netloadv6.fth \ Network boot loading package fload ${BP}/ofw/inetv6/neighdis.fth \ Neighbor discovery Modified: ofw/inetv6/neighdis.fth =================================================================== --- ofw/inetv6/neighdis.fth 2007-08-15 20:20:01 UTC (rev 547) +++ ofw/inetv6/neighdis.fth 2007-08-15 22:59:54 UTC (rev 548) @@ -57,7 +57,7 @@ else ( ip-type 'ip-adr ) his-ip-addr copy-ip-addr ( ip-type ) his-ip-addr my-ip-addr ip-prefix=? if - his-en-addr broadcast-en-addr en= if do-arp then ( ip-type ) + his-en-addr known-en-addr? not if unlock-link-addr do-arp then ( ip-type ) else router-en-addr his-en-addr copy-en-addr then @@ -130,14 +130,14 @@ repeat 2drop ; : process-rd? ( adr len -- router-ad? ) - over c@ d# 134 <> if drop false exit then \ Router advertisement? + over c@ d# 134 <> if 2drop false exit then \ Router advertisement? over 4 + c@ to router-hop-limit - over 5 + c@ to router-flags \ XXX What to do with stateful config? + over 5 + c@ to router-flags \ XXX What to do with stateful config? over 6 + be-w@ to router-lifetime over 8 + be-l@ to router-reachable-time over d# 12 + be-l@ to router-retrans-time - d# 16 /string ( opt-adr,len ) - process-rd-options ( ) + d# 16 /string ( opt-adr,len ) + process-rd-options ( ) true ; : auto-cfg-global? ( -- flag ) @@ -222,10 +222,10 @@ [then] true to use-ipv6? set-mc-hash if close false exit then + ['] (resolve-en-addrv6) to resolve-en-addr configure-ipv6 s-all-ipv6 setup-ip-attr - ['] (resolve-en-addrv6) to resolve-en-addr true ; Modified: ofw/inetv6/tcpv6.fth =================================================================== --- ofw/inetv6/tcpv6.fth 2007-08-15 20:20:01 UTC (rev 547) +++ ofw/inetv6/tcpv6.fth 2007-08-15 22:59:54 UTC (rev 548) @@ -2008,7 +2008,6 @@ ; : free-buffersv6 ( -- ) - free-buffers wbufv6-start /wbufv6 free-mem xmit_bufv6 /xmit-max " free-ipv6" $call-parent ; @@ -2430,9 +2429,6 @@ : open ( -- ) alloc-buffersv6 -[ifdef] open - open -[else] parse-args alloc-buffers @@ -2451,7 +2447,6 @@ true to alive? true -[then] ; [ifndef] include-ipv4 @@ -2494,10 +2489,9 @@ \ to make its way through the sequence of termination states. : disconnectv6 ( -- ) usrclosed - flush-writes flush-writesv6 alive? if tcp_outputv6 then - use-ipv6? if drainv6 else drain then + drainv6 alive? if tcp_close then ; @@ -2505,16 +2499,14 @@ \ external : set-nodelay ( -- ) nodelay set-flag ; : abort-on-reconnect ( -- ) true to abort-on-reconnect? ; +: disconnect ( -- ) ; [then] : close ( -- ) - disconnectv6 -[ifdef] close - close -[else] + use-ipv6? if disconnectv6 else disconnect then ['] delack-tick 0 alarm ['] protocol-tick 0 alarm -[then] + free-buffers free-buffersv6 ;

1 0

r547 - in cpu/x86: . Linux
by svn＠openbios.org 15 Aug '07

15 Aug '07

Author: wmb Date: 2007-08-15 22:20:01 +0200 (Wed, 15 Aug 2007) New Revision: 547 Added: cpu/x86/Linux/catchexc.fth Modified: cpu/x86/loadmach.fth Log: Added signal handling to the x86 Linux-hosted Forth. Added: cpu/x86/Linux/catchexc.fth =================================================================== --- cpu/x86/Linux/catchexc.fth (rev 0) +++ cpu/x86/Linux/catchexc.fth 2007-08-15 20:20:01 UTC (rev 547) @@ -0,0 +1,229 @@ +\ See license at end of file + +decimal + +only forth also hidden also forth definitions +: enterforth + handle-breakpoint +; + +label reenter + \ We get here from then end of save-state, either by branching directly + \ or by modifying the return address in the DPMI exception frame. + + make-odd \ word-align address + 'body main-task dup # dx mov + -4 allot token, \ rewrite address as relocatable + + 0 [dx] up mov \ Establish user pointer + + \ Establish the Data and Return stacks + 'user rp0 rp mov + 'user sp0 bx mov + + \ Restart the Forth interpreter. + cld + + \ Execute enterforth +\ 'body enterforth #) ip lea + make-even \ word-align for relocation + 'body enterforth dup #) ip lea + -4 allot token, \ rewrite address as relocatable +c; + +\ This is the signal handler. When it is called, the stack contains: +\ +\ struct sigcontext ( See /usr/include/asm/sigcontext.h ) +\ signal number +\ return address +\ +\ We copy the data from sigcontext and fiddle the EIP value in sigcontext +\ so that Forth is re-entered at the enterforth addresss + +\ For reference, sigcontext contains: +\ gs, fs, es, ds 00..0c +\ edi, esi, ebp, esp, ebx, edx, ecx, eax 10..2c +\ trapno, err, eip, cs 30..3c +\ esp_at_signal, ss, *fpstate, oldmask 40..4c +\ cr2 50 + +label save-state-signal + + make-odd \ word-align address + 'body main-task dup # dx mov + -4 allot token, \ rewrite address as relocatable + + 0 [dx] up mov \ Establish user pointer + 'user cpu-state bx mov \ Base address of save area + + 4 [sp] si lea \ Address of signal# + + cld \ Increment pointers + ax lods ax offset-of int# [bx] mov + + ax lods ax offset-of %gs [bx] mov + ax lods ax offset-of %fs [bx] mov + ax lods ax offset-of %es [bx] mov + ax lods ax offset-of %ds [bx] mov + + ax lods ax offset-of %edi [bx] mov + ax lods ax offset-of %esi [bx] mov + ax lods ax offset-of %ebp [bx] mov + ax lods ax offset-of %esp [bx] mov \ Correct ESP value will be set later + ax lods ax offset-of %ebx [bx] mov + ax lods ax offset-of %edx [bx] mov + ax lods ax offset-of %ecx [bx] mov + ax lods ax offset-of %eax [bx] mov + + ax lods \ Skip trapno + ax lods ax offset-of %error [bx] mov \ Save err + + ax lods ax offset-of %eip [bx] mov + + \ Change the resume address to go to "reenter" + make-odd \ word-align address + 'body reenter dup # ax mov + -4 allot token, \ rewrite address as relocatable + ax -4 [si] mov \ Resume at reenter address + + ax lods ax offset-of %cs [bx] mov + ax lods ax offset-of %eflags [bx] mov + ax lods \ Skip esp_at_signal + ax lods ax offset-of %ss [bx] mov + + ax ax xor ax dec + ax offset-of %state-valid [bx] mov \ mark saved state as valid + + \ Copy the entire Forth data stack and return stack areas to a save area. + up dx mov \ Save UP + + \ Data Stack (load si first because di is the user pointer!) + 'user sp0 si mov + 'user pssave di mov \ Address of data stack save area + ps-size # si sub \ Bottom of data stack area (in longwords) + + ps-size 4 / # cx mov \ Size of data stack area + rep movs + + dx up mov \ Get user pointer back + + \ Return Stack (load si first because di is the user pointer!) + 'user rp0 si mov + 'user rssave di mov \ Address of return stack save area + rs-size # si sub \ Bottom of return stack area + + rs-size 4 / # cx mov \ Size of return stack area (in longwords) + rep movs + + ret +end-code + + +hidden definitions + +d# 65 constant #signals +#signals /n* buffer: old-signals + +defer save-state +' save-state-signal to save-state + +: set-signal ( handler signal# -- old-handler ) + d# 92 syscall 2drop retval +; +: catch-signal ( signal# -- ) + save-state over set-signal ( signal# old-handler ) + old-signals rot na+ ! +; +: uncatch-signal ( signal# -- ) old-signals over na+ @ swap set-signal drop ; + +: uncatch-signals ( -- ) + d# 02 uncatch-signal \ SIGINT + d# 04 uncatch-signal \ SIGILL + d# 05 uncatch-signal \ SIGTRAP + d# 07 uncatch-signal \ SIGBUS + d# 08 uncatch-signal \ SIGFPE, Divide by 0 + d# 11 uncatch-signal \ SIGSEGV +; + +forth definitions +: catch-signals ( -- ) + pssave drop rssave drop \ Force buffer allocation + [ 0 alloc-reg ] literal alloc-mem is cpu-state + + d# 02 catch-signal \ SIGINT + d# 04 catch-signal \ SIGILL + d# 05 catch-signal \ SIGTRAP + d# 07 catch-signal \ SIGBUS + d# 08 catch-signal \ SIGFPE, Divide by 0 + d# 11 catch-signal \ SIGSEGV +; + +[ifdef] $save-forth +: $save-forth ( name$ -- ) + uncatch-signals $save-forth catch-signals +; +[then] +only forth also definitions + +\ Linux signal names + +string-array exception-names +( 00 ) ," " +( 01 ) ," " +( 02 ) ," Interrupt" +( 03 ) ," " +( 04 ) ," Illegal Instruction" +( 05 ) ," Trap" +( 06 ) ," " +( 07 ) ," Bus error" +( 08 ) ," Floating point error or divide-by-0" +( 09 ) ," " +( 10 ) ," " +( 11 ) ," " +end-string-array + +: (.exception) ( -- ) + int# + dup d# 8 <= if exception-names ". cr exit then + push-decimal (u.) type cr pop-base +; +' (.exception) is .exception +: print-breakpoint + .exception + interactive? 0= if bye then \ Restart only if a human is at the controls + ??cr quit +; +\ ' print-breakpoint is handle-breakpoint + +\ defer restart ( -- ) +hidden also +: sys-init + sys-init + catch-signals + restartable? off +; +only forth also definitions + +\ 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 Modified: cpu/x86/loadmach.fth =================================================================== --- cpu/x86/loadmach.fth 2007-08-15 03:30:45 UTC (rev 546) +++ cpu/x86/loadmach.fth 2007-08-15 20:20:01 UTC (rev 547) @@ -53,6 +53,7 @@ start-module \ Breakpointing fload ${BP}/cpu/x86/cpubpsup.fth \ Breakpoint support fload ${BP}/forth/lib/breakpt.fth +fload ${BP}/cpu/x86/Linux/catchexc.fth \ OS signal handling end-module \ LICENSE_BEGIN

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →