December 2008 - openfirmware - mail.coreboot.org

r1056 - cpu/x86/Darwin
by svn＠openfirmware.info Dec. 30, 2008

Dec. 30, 2008

Author: wmb Date: 2008-12-30 03:31:29 +0100 (Tue, 30 Dec 2008) New Revision: 1056 Added: cpu/x86/Darwin/Makefile cpu/x86/Darwin/catchexc.fth cpu/x86/Darwin/graphdev.fth Log: Checked in some more files for the Mac OSX/Darwin build environment. Added: cpu/x86/Darwin/Makefile =================================================================== --- cpu/x86/Darwin/Makefile (rev 0) +++ cpu/x86/Darwin/Makefile 2008-12-30 02:31:29 UTC (rev 1056) @@ -0,0 +1,65 @@ +# Wrapper makefile for x86 Mac OS X / Darwin + +BP=../../.. + +CFLAGS = -g -m32 -DTARGET_X86 + +# Extra CFLAGS needed by Darwin hosts. GCC doesn't define __unix__ here, +# so we must include it ourselves. +CFLAGS += -D__unix__=1 -Wimplicit-function-declaration +#CFLAGS += -DUSE_XCB + +WRTAIL = forth/wrapper +WRDIR = ${BP}/${WRTAIL} +ZIPTAIL = ${WRTAIL}/zip +ZIPDIR = ${BP}/${ZIPTAIL} + +# Apple's GCC is a bit brain-dead. It's probably best to install gcc43 and +# binutils from macports. See http://macports.macforge.net for how to install +# and use macports. At the very least, binutils from macports seems to be +# required. + +# The default compiler on Mac OS X (as of 10.5 anyway) does not honor -fpic. +# GCC will warn about -fpic not being supported, assumes you meant -fPIC, +# and switches to that. That should be okay, but if you're concerned about it +# I'm providing this already defined override for ${CC}. To use it, just +# uncomment it, or pass CC= on the command line. This is here to make things +# easier for us lazy people. +#CC = /opt/local/bin/gcc-mp-4.3 + +# Unfortunately, Mac OS X does not ship with objcopy. This means that one must +# install binutils from macports, so we override the OBJCOPY variable here +# and just use that instead of calling 'objcopy' itself. +OBJCOPY = /opt/local/bin/gobjcopy + +ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o + +OBJS = wrapper.o logger.o ${ZIPOBJS} + +all: forth x86forth ../build/inflate.bin + +# Use forth when you just need to run Forth but don't care what +# native instruction set it is on. +# Use x86forth when you need to compile new dictionaries that will +# run on x86 systems. +forth: ${OBJS} + ${CC} -m32 -o $@ ${OBJS} + @ln -sf forth x86forth + +# Compile with -O0 because with GCC4, higher optimization levels cause the +# functions to be reordered so the "inflate" entry point is no longer at +# the beginning. +inflate.o: ${ZIPDIR}/inflate.c + ${CC} -c -m32 -O0 -fpic $< -o $@ + +../build/inflate.bin: inflate.o + ${OBJCOPY} -O binary $< $@ + +%.o: ${WRDIR}/%.c + ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + +%.o: ${ZIPDIR}/%.c + ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + +clean: + @rm -f forth x86forth *.o *~ inflate.bin Added: cpu/x86/Darwin/catchexc.fth =================================================================== --- cpu/x86/Darwin/catchexc.fth (rev 0) +++ cpu/x86/Darwin/catchexc.fth 2008-12-30 02:31:29 UTC (rev 1056) @@ -0,0 +1,330 @@ +\ See license at end of file + +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 +; + +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 sp 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 +\ eflags, esp_at_signal, ss, *fpstate 40..4c +\ oldmask, cr2 50..54 + +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 + + sp si mov \ Address of return address + + cld \ Increment pointers + 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 %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 int# [bx] mov \ 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 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 + + \ 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 + +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 + +#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 ) ," Segmentation fault" +end-string-array + +: (.exception) ( -- ) + 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 + .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 + restart-stack h# 400 + to restart-sp + catch-signals + false to hardware-step? + 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 Added: cpu/x86/Darwin/graphdev.fth =================================================================== --- cpu/x86/Darwin/graphdev.fth (rev 0) +++ cpu/x86/Darwin/graphdev.fth 2008-12-30 02:31:29 UTC (rev 1056) @@ -0,0 +1,42 @@ +purpose: Simulation of OFW graphics using X + +dev / new-device + " xgraphics" device-name + : open ( -- okay? ) d# 1200 d# 900 d# 392 syscall 2drop retval 0= ; + : close ( -- ) d# 396 syscall ; + + : fill-rectangle ( color565 x y w h -- ) d# 404 syscall 4drop drop ; +finish-device + +: get-color ( r g b -- color ) + d# 400 syscall 3drop retval +; + +: open-screen + " /xgraphics" open-dev to screen-ih +; + +0 value xred +0 value xgreen +0 value xblue +0 value xmagenta +0 value xblack +0 value xmagenta + +: demo ( -- ) + open-screen + + h# ff h# 00 h# 00 get-color to xred + h# 00 h# ff h# 00 get-color to xgreen + h# 00 h# 00 h# ff get-color to xblue + h# ff h# 00 h# ff get-color to xmagenta + 0 0 0 get-color to xblack + h# ff h# ff h# ff get-color to xmagenta + + d# 500 0 do i xred show-state loop + d# 1000 d# 500 do i xblue show-state loop + d# 1500 d# 1000 do i xgreen show-state loop + d# 2000 d# 1500 do i xmagenta show-state loop + + xblack d# 400 d# 300 d# 50 d# 60 " fill-rectangle" $call-screen +;

1 0

r1055 - cpu/x86 cpu/x86/build forth/wrapper forth/wrapper/zip
by svn＠openfirmware.info Dec. 30, 2008

Dec. 30, 2008

Author: wmb Date: 2008-12-30 03:09:26 +0100 (Tue, 30 Dec 2008) New Revision: 1055 Added: cpu/x86/Darwin/ Modified: cpu/x86/build/builder.dic cpu/x86/syscall.fth forth/wrapper/logger.c forth/wrapper/wrapper.c forth/wrapper/zip/util.c forth/wrapper/zip/zipmem.c Log: Added support for building on Mac OSX/Darwin. Modified: cpu/x86/syscall.fth =================================================================== --- cpu/x86/syscall.fth 2008-12-29 23:50:42 UTC (rev 1054) +++ cpu/x86/syscall.fth 2008-12-30 02:09:26 UTC (rev 1055) @@ -32,6 +32,9 @@ 0 [bx] sp lss then + \ Nonce pushes to enforce 16-byte stack args alignment for Darwin + ax push ax push + cx push \ my SP gs push \ my SS ds push \ my DS @@ -66,6 +69,8 @@ bx pop \ my SS cx pop \ my SP + ax pop ax pop \ Undo nonce pushes + 1 # 'user flat? test 0= if bx ss mov \ Reload my SS:SP then Modified: forth/wrapper/logger.c =================================================================== --- forth/wrapper/logger.c 2008-12-29 23:50:42 UTC (rev 1054) +++ forth/wrapper/logger.c 2008-12-30 02:09:26 UTC (rev 1055) @@ -11,6 +11,7 @@ #endif #include <stdio.h> #include <string.h> +#include <stdlib.h> #ifndef USE_STDIO #include <sys/types.h> #include <sys/stat.h> @@ -18,6 +19,8 @@ #include <time.h> #ifdef MAJC #include <sys/unistd.h> +#else +#include <unistd.h> #endif #ifndef MAXPATHLEN Modified: forth/wrapper/wrapper.c =================================================================== --- forth/wrapper/wrapper.c 2008-12-29 23:50:42 UTC (rev 1054) +++ forth/wrapper/wrapper.c 2008-12-30 02:09:26 UTC (rev 1055) @@ -9,7 +9,7 @@ 3) At which address will the binary run (relocation) This C program finesses problems 1 and 2 by assuming that the C -compiler/linker knows how to do those those things. The Forth +compiler/linker knows how to do those things. The Forth interpreter itself is stored in a file whose format is system-independent. The C program mallocs an array, reads the Forth image into that array, and calls the array as a subroutine, passing it the address of another @@ -56,6 +56,16 @@ #include <stdlib.h> #include <string.h> +/* + * The following #includes and externs fix GCC warnings when compiled with + * -Wimplicit-function-declarations, which I'm doing while trying to get + * this working on Darwin hosts. + */ +#include <ctype.h> +/* zlib externs */ +extern int inflate(); +extern int zip_memory(); + #ifdef __linux__ char *host_os = "Linux"; #define SYS5 1 @@ -91,6 +101,11 @@ #define START_OFFSET 0x10 #endif +#if defined(__APPLE__) +char *host_os = "Darwin"; +#define BSD 1 +#endif + #ifdef MIPS char *host_cpu = "mips"; #define START_OFFSET 8 @@ -200,7 +215,6 @@ #ifdef __unix__ # include <sys/mman.h> -# include <sys/mman.h> # include <limits.h> /* for PAGESIZE */ # ifndef PAGESIZE # define PAGESIZE 4096 @@ -305,13 +319,19 @@ INTERNAL void error(char *, char*); #else + INTERNAL int getnum(char *); INTERNAL void error(); #endif +/* externs from logger.c */ extern char *rootname(); extern char *basename(); +extern void log_output(); +extern void log_input(); +extern void log_command_line(); +extern void log_env(); -#ifndef LinuxPOWERPC +#if !defined(LinuxPOWERPC) && !defined(__APPLE__) extern int read(), write(); #endif Modified: forth/wrapper/zip/util.c =================================================================== --- forth/wrapper/zip/util.c 2008-12-29 23:50:42 UTC (rev 1054) +++ forth/wrapper/zip/util.c 2008-12-30 02:09:26 UTC (rev 1055) @@ -13,6 +13,7 @@ #include "tailor.h" #include "gzip.h" +extern int write_mem(); /* found in zipmem.c */ extern ulg crc_32_tab[]; /* crc table, defined below */ /* =========================================================================== Modified: forth/wrapper/zip/zipmem.c =================================================================== --- forth/wrapper/zip/zipmem.c 2008-12-29 23:50:42 UTC (rev 1054) +++ forth/wrapper/zip/zipmem.c 2008-12-30 02:09:26 UTC (rev 1055) @@ -66,6 +66,7 @@ local void do_exit OF((int exitcode)); int zip_memory OF((void *inbuf, int insize, void *outbuf, int outsize)); + int simple_zip OF((void)); local int read_mem OF((int fd, void *buf, size_t size));

1 0

r1054 - cpu/x86/pc/olpc
by svn＠openfirmware.info Dec. 29, 2008

Dec. 29, 2008

Author: wmb Date: 2008-12-30 00:50:42 +0100 (Tue, 30 Dec 2008) New Revision: 1054 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E25 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-12-29 10:50:20 UTC (rev 1053) +++ cpu/x86/pc/olpc/versions.fth 2008-12-29 23:50:42 UTC (rev 1054) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 24b +macro: FW_MINOR 25 \ The EC microcode macro: EC_VERSION e21

1 0

r1053 - in cpu/x86/pc: . biosload lxdevel neptune olpc
by svn＠openfirmware.info Dec. 29, 2008

Dec. 29, 2008

Author: wmb Date: 2008-12-29 11:50:20 +0100 (Mon, 29 Dec 2008) New Revision: 1053 Added: cpu/x86/pc/biosload/config-grub.fth cpu/x86/pc/biosload/config-kitchensink.fth Modified: cpu/x86/pc/biosload/HOWTO_QEMU.txt cpu/x86/pc/biosload/addrs.fth cpu/x86/pc/biosload/config-coreboot.fth cpu/x86/pc/biosload/config-i945.fth cpu/x86/pc/biosload/config-usbkey.fth cpu/x86/pc/biosload/config-virtualbox.fth cpu/x86/pc/biosload/config.fth cpu/x86/pc/biosload/ofw.bth cpu/x86/pc/elfhdr.fth cpu/x86/pc/lxdevel/addrs.fth cpu/x86/pc/lxdevel/config.fth cpu/x86/pc/neptune/config.fth cpu/x86/pc/olpc/addrs.fth cpu/x86/pc/olpc/banner.fth cpu/x86/pc/olpc/config.fth cpu/x86/pc/olpc/smallconfig.fth cpu/x86/pc/resetend.fth Log: Big cleanup of the biosload configuration files, fixing the GRUB build in the process. The following build variants now appear to work: OLPC, usbkey, QEMU/floppy, QEMU/ROM, GRUB(also etherboot). Modified: cpu/x86/pc/biosload/HOWTO_QEMU.txt =================================================================== --- cpu/x86/pc/biosload/HOWTO_QEMU.txt 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/biosload/HOWTO_QEMU.txt 2008-12-29 10:50:20 UTC (rev 1053) @@ -14,7 +14,6 @@ $ cd cpu/x86/pc/biosload/ $ cp config-virtualbox.fth config.fth $ cd build - $ cd cpu/x86/pc/biosload/build $ make floppyofw.img The "config-virtualbox.fth" configuration is known to work with QEMU. Modified: cpu/x86/pc/biosload/addrs.fth =================================================================== --- cpu/x86/pc/biosload/addrs.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/biosload/addrs.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -8,8 +8,8 @@ \ early startup code - the first few instructions in the image - \ copies it to get it out of the way of things like OS load areas. -[ifdef] linuxbios-loaded - [ifdef] qemu-loaded +[ifdef] coreboot-loaded + [ifdef] coreboot-qemu \ when running in qemu OFW is not in ROM but loaded to RAM by elfboot h# 198.0080 constant dropin-base \ Location of payload in RAM dropin-base h# 20 + constant ResetBase \ Location of "reset" dropin in RAM Modified: cpu/x86/pc/biosload/config-coreboot.fth =================================================================== --- cpu/x86/pc/biosload/config-coreboot.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/biosload/config-coreboot.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -5,13 +5,11 @@ \ that control the boot device to boot vmlinuz from drive A. create pc-linux -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -create linuxbios-loaded +\ - ELF format (no pheader) - ROM - Coreboot direct +create coreboot-loaded +create coreboot-qemu \ Coreboot QEMU variant -\ Load and run in qemu -create qemu-loaded - -\ LinuxBIOS+OFW under QEMU currently does not do VGA right +\ Coreboot+OFW under QEMU currently does not do VGA right create serial-console \ In virtual mode, OFW runs with the MMU on. The advantages are Added: cpu/x86/pc/biosload/config-grub.fth =================================================================== --- cpu/x86/pc/biosload/config-grub.fth (rev 0) +++ cpu/x86/pc/biosload/config-grub.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -0,0 +1,50 @@ +\ See license at end of file +purpose: Establish configuration definitions + +\ --- The environment that "boots" OFW --- +\ - Image Format - Example Media - previous stage bootloader + +\ - ELF format w/ Multiboot signature - various media - GRUB +create grub-loaded + +create debug-startup +\ create serial-console +create resident-packages +create addresses-assigned \ Don't reassign PCI addresses +\ create virtual-mode +\ create use-root-isa +create use-timestamp-counter +create use-pci-isa +create use-isa-ide +create use-ega +create use-elf +\ create use-ne2000 +create use-watch-all +create use-null-nvram +\ create no-floppy-node + +fload ${BP}/cpu/x86/pc/biosload/addrs.fth + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/pc/biosload/config-i945.fth =================================================================== --- cpu/x86/pc/biosload/config-i945.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/biosload/config-i945.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -1,81 +1,13 @@ \ See license at end of file purpose: Establish configuration definitions - version for i945 chipset -\ create pc \ Demo version for generic PC -\ create pc-linux \ Demo version for generic PC and Linux -\ create pc-serial \ Demo version for generic PC - \ --- The environment that "boots" OFW --- \ - Image Format - Example Media - previous stage bootloader -\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux -\ create syslinux-loaded - -\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload -\ create bzimage-loaded - -\ - ELF format w/ Multiboot signature - various - GRUB -\ create grub-loaded -\ create etherboot-variant \ Enable additional tweaks for Etherboot - -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -\ create linuxbios-loaded - -\ Load and run in qemu -\ create qemu-loaded - \ Load from ROM by preOF code from Intel create preof-loaded -[ifdef] pc-serial create serial-console -create pc -[then] - -[ifdef] qemu-loaded \ LinuxBIOS+OFW under QEMU currently doesn't do VGA right -create serial-console -[then] - -[ifdef] etherboot-variant -create debug-startup -create serial-console -[then] - -[ifdef] pc-linux -\ In virtual mode, OFW runs with the MMU on. The advantages are -\ that OFW can automatically locate itself out of the way, at the -\ top of physical memory, it can dynamically allocate exactly as -\ much physical memory as it needs, and it can remain alive after -\ the OS starts. The disadvantage is that it is more confusing - -\ you always have to be aware of the distinction between virtual -\ and physical addresses. - -\ Here we use virtual mode for Linux, so that we can debug past -\ the point where Linux starts using the MMU. It isn't strictly -\ necessary to use virtual mode if you just want to boot Linux -\ and then have OFW disappear. -create virtual-mode -create pc -create linux-support -[then] - -[ifdef] pc -\ create pseudo-nvram -create resident-packages -create addresses-assigned \ Don't reassign PCI addresses -\ create virtual-mode -create use-root-isa -create use-isa-ide -create use-ega -create use-elf -create use-ne2000 -create use-watch-all -create use-null-nvram -create no-floppy-node -[then] - -[ifdef] preof-loaded -create serial-console create use-timestamp-counter create resident-packages create addresses-assigned \ Don't reassign PCI addresses @@ -86,9 +18,9 @@ create use-watch-all create use-null-nvram create no-floppy-node -[then] fload ${BP}/cpu/x86/pc/biosload/addrs.fth + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Added: cpu/x86/pc/biosload/config-kitchensink.fth =================================================================== --- cpu/x86/pc/biosload/config-kitchensink.fth (rev 0) +++ cpu/x86/pc/biosload/config-kitchensink.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -0,0 +1,147 @@ +\ See license at end of file +purpose: Establish configuration definitions + +\ create pc \ Demo version for generic PC +\ create pc-linux \ Demo version for generic PC and Linux +\ create pc-serial \ Demo version for generic PC + +\ --- The environment that "boots" OFW --- +\ - Image Format - Example Media - previous stage bootloader + +\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux +\ create syslinux-loaded + +\ - Linux kernel format - USB Key w/ FAT FS - Coreboot w/ stripped Linux payload +\ create bzimage-loaded + +\ - ELF format w/ Multiboot signature - various - GRUB +create grub-loaded + +\ - ELF format (no pheader) - Coreboot +\ create coreboot-loaded + +\ create coreboot-qemu \ Variant + +\ Load and run in VirtualBox +\ create virtualbox-loaded + +\ Load from ROM by preOF code from Intel +\ create preof-loaded + +[ifdef] pc-serial +create serial-console +create pc +[then] + +[ifdef] coreboot-qemu \ Coreboot+OFW under QEMU currently does not do VGA right +create serial-console +[then] + +[ifdef] grub-loaded +create debug-startup +\ create serial-console +create resident-packages +create addresses-assigned \ Don't reassign PCI addresses +\ create virtual-mode +\ create use-root-isa +create use-timestamp-counter +create use-pci-isa +create use-isa-ide +create use-ega +create use-elf +\ create use-ne2000 +create use-watch-all +create use-null-nvram +\ create no-floppy-node +[then] + +[ifdef] virtualbox-loaded +\ create debug-startup +\ create serial-console +create resident-packages +create addresses-assigned \ Don't reassign PCI addresses +\ create virtual-mode +\ create use-root-isa +create use-timestamp-counter +create use-pci-isa +create use-isa-ide +create use-ega +create use-elf +\ create use-ne2000 +create use-watch-all +create use-null-nvram +\ create no-floppy-node +[then] + +[ifdef] pc-linux +\ In virtual mode, OFW runs with the MMU on. The advantages are +\ that OFW can automatically locate itself out of the way, at the +\ top of physical memory, it can dynamically allocate exactly as +\ much physical memory as it needs, and it can remain alive after +\ the OS starts. The disadvantage is that it is more confusing - +\ you always have to be aware of the distinction between virtual +\ and physical addresses. + +\ Here we use virtual mode for Linux, so that we can debug past +\ the point where Linux starts using the MMU. It is not strictly +\ necessary to use virtual mode if you just want to boot Linux +\ and then have OFW disappear. +create virtual-mode +create pc +create linux-support +[then] + +[ifdef] pc +\ create pseudo-nvram +create resident-packages +create addresses-assigned \ Don't reassign PCI addresses +\ create virtual-mode +create use-root-isa +create use-isa-ide +create use-ega +create use-elf +create use-ne2000 +create use-watch-all +create use-null-nvram +create no-floppy-node +[then] + +[ifdef] preof-loaded +create serial-console +create use-timestamp-counter +create resident-packages +create addresses-assigned \ Don't reassign PCI addresses +\ create virtual-mode +create use-root-isa +create use-isa-ide +create use-elf +create use-watch-all +create use-null-nvram +create no-floppy-node +[then] + +fload ${BP}/cpu/x86/pc/biosload/addrs.fth + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/pc/biosload/config-usbkey.fth =================================================================== --- cpu/x86/pc/biosload/config-usbkey.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/biosload/config-usbkey.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -1,65 +1,15 @@ \ See license at end of file purpose: Configuration for loading from a USB key via Syslinux -\ create pc \ Demo version for generic PC -\ create pc-linux \ Demo version for generic PC and Linux -create pc-serial \ Demo version for generic PC - \ --- The environment that "boots" OFW --- \ - Image Format - Example Media - previous stage bootloader \ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux create syslinux-loaded -\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload -\ create bzimage-loaded - -\ - ELF format w/ Multiboot signature - various - GRUB -\ create grub-loaded -\ create etherboot-variant \ Enable additional tweaks for Etherboot - -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -\ create linuxbios-loaded - -\ Load and run in qemu -\ create qemu-loaded - -\ Load from ROM by preOF code from Intel -\ create preof-loaded - -[ifdef] pc-serial create serial-console create pc -[then] -[ifdef] qemu-loaded \ LinuxBIOS+OFW under QEMU currently doesn't do VGA right -create serial-console -[then] - -[ifdef] etherboot-variant -create debug-startup -create serial-console -[then] - -[ifdef] pc-linux -\ In virtual mode, OFW runs with the MMU on. The advantages are -\ that OFW can automatically locate itself out of the way, at the -\ top of physical memory, it can dynamically allocate exactly as -\ much physical memory as it needs, and it can remain alive after -\ the OS starts. The disadvantage is that it is more confusing - -\ you always have to be aware of the distinction between virtual -\ and physical addresses. - -\ Here we use virtual mode for Linux, so that we can debug past -\ the point where Linux starts using the MMU. It isn't strictly -\ necessary to use virtual mode if you just want to boot Linux -\ and then have OFW disappear. -create virtual-mode -create pc -create linux-support -[then] - -[ifdef] pc \ create pseudo-nvram create resident-packages create addresses-assigned \ Don't reassign PCI addresses @@ -72,23 +22,9 @@ create use-watch-all create use-null-nvram create no-floppy-node -[then] -[ifdef] preof-loaded -create serial-console -create use-timestamp-counter -create resident-packages -create addresses-assigned \ Don't reassign PCI addresses -\ create virtual-mode -create use-root-isa -create use-isa-ide -create use-elf -create use-watch-all -create use-null-nvram -create no-floppy-node -[then] - fload ${BP}/cpu/x86/pc/biosload/addrs.fth + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/biosload/config-virtualbox.fth =================================================================== --- cpu/x86/pc/biosload/config-virtualbox.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/biosload/config-virtualbox.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -1,45 +1,12 @@ \ See license at end of file purpose: Establish configuration definitions -\ create pc \ Demo version for generic PC -\ create pc-linux \ Demo version for generic PC and Linux -\ create pc-serial \ Demo version for generic PC - \ --- The environment that "boots" OFW --- \ - Image Format - Example Media - previous stage bootloader -\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux -\ create syslinux-loaded - -\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload -\ create bzimage-loaded - -\ - ELF format w/ Multiboot signature - various - GRUB -\ create grub-loaded -\ create etherboot-variant \ Enable additional tweaks for Etherboot - -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -\ create linuxbios-loaded - -\ Load and run in qemu -\ create qemu-loaded - -\ Load and run in VirtualBox +\ Load and run in VirtualBox (also works for other emulators) create virtualbox-loaded -\ Load from ROM by preOF code from Intel -\ create preof-loaded - -[ifdef] pc-serial -create serial-console -create pc -[then] - -[ifdef] qemu-loaded \ LinuxBIOS+OFW under QEMU currently does not do VGA right -create serial-console -[then] - -[ifdef] virtualbox-loaded \ create debug-startup \ create serial-console create resident-packages @@ -55,60 +22,7 @@ create use-watch-all create use-null-nvram \ create no-floppy-node -[then] -[ifdef] etherboot-variant -create debug-startup -create serial-console -[then] - -[ifdef] pc-linux -\ In virtual mode, OFW runs with the MMU on. The advantages are -\ that OFW can automatically locate itself out of the way, at the -\ top of physical memory, it can dynamically allocate exactly as -\ much physical memory as it needs, and it can remain alive after -\ the OS starts. The disadvantage is that it is more confusing - -\ you always have to be aware of the distinction between virtual -\ and physical addresses. - -\ Here we use virtual mode for Linux, so that we can debug past -\ the point where Linux starts using the MMU. It is not strictly -\ necessary to use virtual mode if you just want to boot Linux -\ and then have OFW disappear. -create virtual-mode -create pc -create linux-support -[then] - -[ifdef] pc -\ create pseudo-nvram -create resident-packages -create addresses-assigned \ Don't reassign PCI addresses -\ create virtual-mode -create use-root-isa -create use-isa-ide -create use-ega -create use-elf -create use-ne2000 -create use-watch-all -create use-null-nvram -create no-floppy-node -[then] - -[ifdef] preof-loaded -create serial-console -create use-timestamp-counter -create resident-packages -create addresses-assigned \ Don't reassign PCI addresses -\ create virtual-mode -create use-root-isa -create use-isa-ide -create use-elf -create use-watch-all -create use-null-nvram -create no-floppy-node -[then] - fload ${BP}/cpu/x86/pc/biosload/addrs.fth \ LICENSE_BEGIN Modified: cpu/x86/pc/biosload/config.fth =================================================================== --- cpu/x86/pc/biosload/config.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/biosload/config.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -1,45 +1,12 @@ \ See license at end of file purpose: Establish configuration definitions -\ create pc \ Demo version for generic PC -\ create pc-linux \ Demo version for generic PC and Linux -\ create pc-serial \ Demo version for generic PC - \ --- The environment that "boots" OFW --- \ - Image Format - Example Media - previous stage bootloader -\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux -\ create syslinux-loaded - -\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload -\ create bzimage-loaded - -\ - ELF format w/ Multiboot signature - various - GRUB -\ create grub-loaded -\ create etherboot-variant \ Enable additional tweaks for Etherboot - -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -\ create linuxbios-loaded - -\ Load and run in qemu -\ create qemu-loaded - -\ Load and run in VirtualBox +\ Load and run in VirtualBox (also works for other emulators) create virtualbox-loaded -\ Load from ROM by preOF code from Intel -\ create preof-loaded - -[ifdef] pc-serial -create serial-console -create pc -[then] - -[ifdef] qemu-loaded \ LinuxBIOS+OFW under QEMU currently does not do VGA right -create serial-console -[then] - -[ifdef] virtualbox-loaded \ create debug-startup \ create serial-console create resident-packages @@ -55,60 +22,7 @@ create use-watch-all create use-null-nvram \ create no-floppy-node -[then] -[ifdef] etherboot-variant -create debug-startup -create serial-console -[then] - -[ifdef] pc-linux -\ In virtual mode, OFW runs with the MMU on. The advantages are -\ that OFW can automatically locate itself out of the way, at the -\ top of physical memory, it can dynamically allocate exactly as -\ much physical memory as it needs, and it can remain alive after -\ the OS starts. The disadvantage is that it is more confusing - -\ you always have to be aware of the distinction between virtual -\ and physical addresses. - -\ Here we use virtual mode for Linux, so that we can debug past -\ the point where Linux starts using the MMU. It is not strictly -\ necessary to use virtual mode if you just want to boot Linux -\ and then have OFW disappear. -create virtual-mode -create pc -create linux-support -[then] - -[ifdef] pc -\ create pseudo-nvram -create resident-packages -create addresses-assigned \ Don't reassign PCI addresses -\ create virtual-mode -create use-root-isa -create use-isa-ide -create use-ega -create use-elf -create use-ne2000 -create use-watch-all -create use-null-nvram -create no-floppy-node -[then] - -[ifdef] preof-loaded -create serial-console -create use-timestamp-counter -create resident-packages -create addresses-assigned \ Don't reassign PCI addresses -\ create virtual-mode -create use-root-isa -create use-isa-ide -create use-elf -create use-watch-all -create use-null-nvram -create no-floppy-node -[then] - fload ${BP}/cpu/x86/pc/biosload/addrs.fth \ LICENSE_BEGIN Modified: cpu/x86/pc/biosload/ofw.bth =================================================================== --- cpu/x86/pc/biosload/ofw.bth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/biosload/ofw.bth 2008-12-29 10:50:20 UTC (rev 1053) @@ -33,21 +33,16 @@ [ifdef] grub-loaded fload ${BP}/cpu/x86/pc/elfhdr.fth - [ifdef] etherboot-variant - .( --- Saving as ofwnet.elf - GRUB multiboot format) cr - writing ofwnet.elf - [else] .( --- Saving as ofwgrub.elf - GRUB multiboot format) cr writing ofwgrub.elf - [then] elf-header /elf-header ofd @ fputs [then] -[ifdef] linuxbios-loaded - .( --- Saving as ofwlb.elf - LinuxBIOS payload format) cr +[ifdef] coreboot-loaded + .( --- Saving as ofwlb.elf - Coreboot payload format) cr fload ${BP}/cpu/x86/pc/elfhdr.fth writing ofwlb.elf - [ifdef] qemu-loaded + [ifdef] coreboot-qemu elf-header /elf-header ofd @ fputs [else] elf-header /elf-header 0 " elf-header" write-dropin @@ -62,6 +57,7 @@ [then] [ifdef] bzimage-loaded + \ - Linux kernel format - USB Key w/ FAT FS - Coreboot w/ stripped Linux payload .( --- Saving as ofw.bzi - Linux kernel format) cr fload ${BP}/cpu/x86/pc/bzhdr.fth writing ofw.bzi @@ -137,15 +133,14 @@ " ${BP}/ofw/termemu/cp881-16.obf" " font" $add-deflated-dropin [then] - [ifdef] grub-loaded - ofd @ fsize pad ! \ file size; store in memory for convenience below + ofd @ fsize h# 60 - pad ! \ file size; store in memory for convenience below h# 44 ofd @ fseek \ Seek to file size field; see elfhdr.bth pad 4 ofd @ fputs \ Patch file size pad 4 ofd @ fputs \ Patch memory size [then] -[ifdef] qemu-loaded +[ifdef] coreboot-qemu ofd @ fsize pad ! \ file size; store in memory for convenience below h# 44 ofd @ fseek \ Seek to file size field; see elfhdr.bth pad 4 ofd @ fputs \ Patch file size Modified: cpu/x86/pc/elfhdr.fth =================================================================== --- cpu/x86/pc/elfhdr.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/elfhdr.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -1,6 +1,43 @@ \ See license at end of file purpose: Create an ELF format +\ This handles several different loader cases + +0 value #pheaders +0 value elf-entry +0 value file-offset +0 value elf-addr + +[ifdef] grub-loaded +\ For GRUB, we want to copy the stuff after the ELF headers and the Multiboot +\ header to the final RAM location (dropin-base), so OFW sees just the dropins. +\ The start address is just after the first dropin header. + +dropin-base h# 20 + to elf-entry \ Skip OBMD header in RAM copy +1 to #pheaders \ The pheader causes the image to be copied to RAM +h# 54 h# 0c + to file-offset \ Copy start after pheader + multiboot header (0c) +dropin-base to elf-addr \ Copy file image directly to dropin-base +[then] + +[ifdef] coreboot-loaded + [ifdef] coreboot-qemu + \ For coreboot under QEMU, we want to copy everything, including the ELF headers. + \ We want the ELF headers to be in memory, but Forth shouldn't see them, so we + \ put the headers before dropin-base + + dropin-base h# 20 + to elf-entry \ Skip OBMD header in RAM copy + 1 to #pheaders \ The pheader causes the image to be copied to RAM + 0 to file-offset \ Copy the whole thing, don't skip the ELF headers + dropin-base h# 80 - to elf-addr \ Copied headers will precede dropin-base + [else] + \ For coreboot running from ROM, we can leave everything in ROM, no need to copy, + \ so there's no need for a pheader. + + dropin-base h# 80 + h# 20 + to elf-entry \ Entry is after ELF + OBMD headers + 0 to #pheaders \ No pheaders; we'll use the ROM copy of the dropins + [then] +[then] + create elf-header h# 7f c, char E c, char L c, char F c, 1 c, \ 4 @@ -12,88 +49,42 @@ 2 w, \ 0x10 object file type ET_EXEC 3 w, \ 0x12 architecture EM_386 1 l, \ 0x14 object file version EV_CURRENT - - \ Skip this ELF dropin (80) + the OBMD header of the next dropin (20) -[ifdef] etherboot-variant - \ elf-header is not a dropin, so we only need to skip OBMD header of reset - \ we adjust the load-address below at position 0x40 - dropin-base h# 20 + l, \ 0x18 entry point virtual address -[then] -[ifdef] qemu-loaded - \ skip OBMD header but keep elf-header because elfboot in LinuxBIOS needs it - dropin-base h# 20 + l, \ 0x18 entry point virtual address -[else] - \ Skip this ELF dropin (80) + the OBMD header of the next dropin (20) - dropin-base h# 80 + h# 20 + l, \ 0x18 entry point virtual address -[then] + elf-entry l, \ 0x18 entry point virtual address h# 34 l, \ 0x1c program header file offset 0 l, \ 0x20 section header file offset 0 l, \ 0x24 flags h# 34 w, \ 0x28 ELF header size h# 20 w, \ 0x2a program header table entry size -[ifdef] grub-loaded - 1 w, \ 0x2c program header table entry count (one pheader) -[then] -[ifdef] qemu-loaded - 1 w, \ 0x2c program header table entry count (one pheader) -[else] - 0 w, \ 0x2c program header table entry count (no pheaders) -[then] + #pheaders w, \ 0x2c program header table entry count (one pheader) 0 w, \ 0x2e section header table entry size 0 w, \ 0x30 section header table entry count 0 w, \ 0x32 section header string table index -[ifdef] grub-loaded \ Pheader causes GRUB to copy us to RAM - \ 0x34 Pheader - 1 l, \ 0x34 entry type PT_LOAD - h# 54 l, \ 0x38 file offset - 0 l, \ 0x3c vaddr -[then] - -[ifdef] qemu-loaded \ Pheader causes elfboot to copy us to RAM - \ 0x34 Pheader - 1 l, \ 0x34 entry type PT_LOAD - 0 l, \ 0x38 file offset - dropin-base 80 - l, \ 0x3c vaddr -[then] - -[ifdef] etherboot-variant - \ we need to skip what left of elf-hdr. to get it to point to a dropin - \ why is it 0x14 ? I would have thought it should be the size of the multiboot header - \ which is 0x0c - dropin-base h# 14 - l, \ 0x40 paddr \ Where to put the bits -[then] - -[ifdef] qemu-loaded - dropin-base h# 80 - l, \ 0x40 paddr \ Where to put the bits +#pheaders [if] + 1 l, \ 0x34 entry type PT_LOAD + file-offset l, \ 0x38 file offset + elf-addr l, \ 0x3c vaddr + elf-addr l, \ 0x40 paddr - where to put the bits + h# ffffffff l, \ 0x44 file size - backpatched later + h# ffffffff l, \ 0x48 memory size - backpatched later + 7 l, \ 0x4c entry flags RWX + 0 l, \ 0x50 alignment + \ 0x54 End of pheader [else] - dropin-base l, \ 0x40 paddr \ Where to put the bits + here h# 54 h# 34 - dup allot erase \ Pad to make the size consistent [then] - h# ffffffff l, \ 0x44 file size \ backpatched later - h# ffffffff l, \ 0x48 memory size \ backpatched later -[ifndef] qemu-loaded - 0 l, - 0 l, -[then] - 7 l, \ 0x4c entry flags RWX - 0 l, \ 0x50 alignment - \ 0x54 End of pheader -[then] [ifdef] grub-loaded \ "Multiboot" header that GRUB looks for - h# 1BADB002 , \ 0x54 - h# 0 , \ 0x58 - h# 1BADB002 negate , \ 0x5c + h# 1BADB002 , \ 0x54 signature + h# 0 , \ 0x58 flags + h# 1BADB002 negate , \ 0x5c checksum: -(signature + flags) \ 0x60 End +[else] + here h# 60 h# 54 - dup allot erase \ Pad to make the size consistent [then] -[ifdef] linuxbios-loaded - \ Pad out to h# 60 so the size is the same as above - here h# 60 h# 34 - dup allot erase -[then] - - \ The total size, including the dropin header, will be h# 80 +\ The total size, including the dropin header, will be h# 80 here elf-header - constant /elf-header \ LICENSE_BEGIN Modified: cpu/x86/pc/lxdevel/addrs.fth =================================================================== --- cpu/x86/pc/lxdevel/addrs.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/lxdevel/addrs.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -27,47 +27,6 @@ h# 20.0000 constant /fw-ram [then] -[ifdef] linuxbios-loaded -\ h# d8.0000 constant dropin-base -h# fff2.0000 constant dropin-base \ Location of payload in FLASH -\ h# fff8.0000 constant dropin-base \ Location of payload in FLASH -dropin-base h# 80 + h# 20 + constant ResetBase \ Location of "reset" dropin in ROM -h# 08.0000 constant dropin-size -h# 1e0.0000 constant fw-pa -h# 20.0000 constant /fw-ram -h# fff0.0000 constant rom-pa -h# 10.0000 constant /rom -[then] - -[ifdef] old-bzimage-loaded -\ h# d8.0000 constant dropin-base -h# 10.0020 constant dropin-base \ RAM address where Linux normally loads -h# 08.0000 constant dropin-size -h# 20.0000 constant fw-pa -h# 20.0000 constant /fw-ram -[then] - -[ifdef] bzimage-loaded -h# 1d8.0020 constant dropin-base \ RAM address where we want to end up -h# 08.0000 constant dropin-size -h# 1e0.0000 constant fw-pa -h# 20.0000 constant /fw-ram -[then] - -[ifdef] syslinux-loaded -h# 10.1020 constant dropin-base -h# 07.e0e0 constant dropin-size -h# 20.0000 constant fw-pa -h# 20.0000 constant /fw-ram -[then] - -[ifdef] grub-loaded -h# 1b8.0000 constant dropin-base -h# 08.0000 constant dropin-size -h# 1c0.0000 constant fw-pa -h# 20.0000 constant /fw-ram -[then] - h# 80.0000 constant def-load-base \ Convenient for initrd \ The heap starts at RAMtop, which on this system is "fw-pa /fw-ram +" Modified: cpu/x86/pc/lxdevel/config.fth =================================================================== --- cpu/x86/pc/lxdevel/config.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/lxdevel/config.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -10,18 +10,6 @@ \ - OBMD format - ROM - direct boot from ROM create rom-loaded -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -\ create linuxbios-loaded - -\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload -\ create bzimage-loaded - -\ - ELF format w/ Multiboot signature - various - GRUB -\ create grub-loaded - -\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux -\ create syslinux-loaded - create virtual-mode create addresses-assigned \ Define if base addresses are already assigned \ create serial-console \ Define to default to serial port for console Modified: cpu/x86/pc/neptune/config.fth =================================================================== --- cpu/x86/pc/neptune/config.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/neptune/config.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -12,19 +12,6 @@ \ - OBMD format - ROM - direct boot from ROM create rom-loaded -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -\ create linuxbios-loaded - -\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload -\ create bzimage-loaded - -\ - ELF format w/ Multiboot signature - various - GRUB -\ create grub-loaded - -\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux -\ create syslinux-loaded - - create virtual-mode create addresses-assigned \ Define if base addresses are already assigned create serial-console \ Define to default to serial port for console Modified: cpu/x86/pc/olpc/addrs.fth =================================================================== --- cpu/x86/pc/olpc/addrs.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/olpc/addrs.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -22,47 +22,6 @@ h# 40.0000 constant /fw-area [then] -[ifdef] linuxbios-loaded -\ h# d8.0000 constant dropin-base -h# fff2.0000 constant dropin-base \ Location of payload in FLASH -\ h# fff8.0000 constant dropin-base \ Location of payload in FLASH -dropin-base h# 80 + h# 20 + constant ResetBase \ Location of "reset" dropin in ROM -h# 08.0000 constant dropin-size -h# 1e0.0000 constant fw-pa -h# 20.0000 constant /fw-ram -h# fff0.0000 constant rom-pa -h# 10.0000 constant /rom -[then] - -[ifdef] old-bzimage-loaded -\ h# d8.0000 constant dropin-base -h# 10.0020 constant dropin-base \ RAM address where Linux normally loads -h# 08.0000 constant dropin-size -h# 20.0000 constant fw-pa -h# 20.0000 constant /fw-ram -[then] - -[ifdef] bzimage-loaded -h# 1d8.0020 constant dropin-base \ RAM address where we want to end up -h# 08.0000 constant dropin-size -h# 1e0.0000 constant fw-pa -h# 20.0000 constant /fw-ram -[then] - -[ifdef] syslinux-loaded -h# 10.1020 constant dropin-base -h# 07.e0e0 constant dropin-size -h# 20.0000 constant fw-pa -h# 20.0000 constant /fw-ram -[then] - -[ifdef] grub-loaded -h# 1b8.0000 constant dropin-base -h# 08.0000 constant dropin-size -h# 1c0.0000 constant fw-pa -h# 20.0000 constant /fw-ram -[then] - h# 80.0000 constant def-load-base \ Convenient for initrd \ The heap starts at RAMtop, which on this system is "fw-pa /fw-ram +" Modified: cpu/x86/pc/olpc/banner.fth =================================================================== --- cpu/x86/pc/olpc/banner.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/olpc/banner.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -9,15 +9,9 @@ \ major-release (.) type ." ." minor-release (.) type sub-release type \ pop-base \ This is the manufacturing signature -[ifdef] linuxbios-loaded - h# ffff.ffc0 h# 10 type cr -[then] [ifdef] rom-loaded h# ffff.ffc0 h# 10 type cr [then] -[ifdef] bzimage-loaded - ." booted from disk - " .built -[then] ; : (xbanner-basics) ( -- ) Modified: cpu/x86/pc/olpc/config.fth =================================================================== --- cpu/x86/pc/olpc/config.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/olpc/config.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -9,19 +9,6 @@ \ - OBMD format - ROM - direct boot from ROM create rom-loaded -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -\ create linuxbios-loaded - -\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload -\ create bzimage-loaded - -\ - ELF format w/ Multiboot signature - various - GRUB -\ create grub-loaded - -\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux -\ create syslinux-loaded - - \ create virtual-mode create addresses-assigned \ Define if base addresses are already assigned \ create serial-console \ Define to default to serial port for console Modified: cpu/x86/pc/olpc/smallconfig.fth =================================================================== --- cpu/x86/pc/olpc/smallconfig.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/olpc/smallconfig.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -9,19 +9,6 @@ \ - OBMD format - ROM - direct boot from ROM create rom-loaded -\ - ELF format (no pheader) - ROM - LinuxBIOS direct -\ create linuxbios-loaded - -\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload -\ create bzimage-loaded - -\ - ELF format w/ Multiboot signature - various - GRUB -\ create grub-loaded - -\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux -\ create syslinux-loaded - - \ create virtual-mode create addresses-assigned \ Define if base addresses are already assigned \ create serial-console \ Define to default to serial port for console Modified: cpu/x86/pc/resetend.fth =================================================================== --- cpu/x86/pc/resetend.fth 2008-12-28 10:49:29 UTC (rev 1052) +++ cpu/x86/pc/resetend.fth 2008-12-29 10:50:20 UTC (rev 1053) @@ -4,9 +4,8 @@ \ The memory layout information from the start dropin is stored in low \ memory. -[ifndef] qemu-loaded -[ifndef] syslinux-loaded -[ifndef] preof-loaded + \ Beginning of "switch to new GDT" section + \ Move GDT to low memory. We use the first location at gdt-pa as \ scratch memory for sgdt, and put the actual gdt at gdt-pa + 0x10 gdt-pa # ax mov @@ -17,30 +16,26 @@ cx inc gdt-pa h# 10 + # di mov \ New GDT base - di 2 [ax] mov \ Set new GDT base rep movsb \ Copy ROM GDT to RAM - \ Copy code and data segment descriptors from 10,18 to 60,68 - gdt-pa h# 10 + h# 10 + # si mov \ Descriptor 0x10 - src - gdt-pa h# 10 + h# 60 + # di mov \ Descriptor 0x60 - dst - 4 # cx mov \ 4 longwords, 2 descriptors - rep movs + \ Move the code and data descriptors to 60,68 + gdt-pa h# 10 + h# 60 + # di mov \ Destination - New descriptor 0x60 - op: h# ff # 0 [ax] mov \ Make GDT bigger for Linux + cs si mov 2 [ax] si add \ Source - Current code descriptor + movs movs \ 2 longwords (1 descriptor) -> 60 + ds si mov 2 [ax] si add \ Source - Current data descriptor + movs movs \ 2 longwords (1 descriptor) -> 68 + + op: h# ff # 0 [ax] mov \ New GDT size + gdt-pa h# 10 + # 2 [ax] mov \ New GDT base 0 [ax] lgdt \ Setup RAM GDT - \ Next time segment registers are changed, they will be - \ reloaded from memory. - - \ qemu hangs when trying to do this + \ Reload code segment descriptor from new table here asm-base - ResetBase + 7 + h# 60 #) far jmp \ 7-byte instruction -\ here asm-base - ResetBase + 7 + h# 10 #) far jmp \ 7-byte instruction - \ nop nop nop nop -\ begin again + \ Reload data segment descriptors from new table h# 68 # ax mov -\ h# 18 # ax mov ax ds mov ax es mov ax fs mov @@ -49,13 +44,12 @@ h# 20 # al mov al h# 80 # out + \ End of "switch to new GDT" section + [ifdef] mem-info-pa gdt-pa /page round-up # ax mov \ Current low-memory high water mark ax mem-info-pa 2 la+ #) mov \ Store in memory info area [then] -[then] -[then] -[then] cld

1 0

r1052 - dev/video/controlr
by svn＠openfirmware.info Dec. 28, 2008

Dec. 28, 2008

Author: wmb Date: 2008-12-28 11:49:29 +0100 (Sun, 28 Dec 2008) New Revision: 1052 Modified: dev/video/controlr/vga.fth Log: Eliminated a minor spurious depencency introduced by a recent checkin that broke the OLPC build. Modified: dev/video/controlr/vga.fth =================================================================== --- dev/video/controlr/vga.fth 2008-12-28 04:15:18 UTC (rev 1051) +++ dev/video/controlr/vga.fth 2008-12-28 10:49:29 UTC (rev 1052) @@ -199,11 +199,13 @@ 4 feature-ctl! \ Vertical sync ctl hsync-on ; +[ifdef] init-dac : basic-vga ( -- ) ['] (vga-crt-table) to crt-table ['] basic-vga-init to init-controller ['] noop is init-dac ; +[then] \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

r1051 - cpu/x86/pc/biosload
by svn＠openfirmware.info Dec. 28, 2008

Dec. 28, 2008

Author: wmb Date: 2008-12-28 05:15:18 +0100 (Sun, 28 Dec 2008) New Revision: 1051 Added: cpu/x86/pc/biosload/config-coreboot.fth Log: Added a new file "cpu/x86/pc/biosload/config-coreboot.fth Added: cpu/x86/pc/biosload/config-coreboot.fth =================================================================== --- cpu/x86/pc/biosload/config-coreboot.fth (rev 0) +++ cpu/x86/pc/biosload/config-coreboot.fth 2008-12-28 04:15:18 UTC (rev 1051) @@ -0,0 +1,73 @@ +purpose: Configuration setting for OFW as a Coreboot payload under QEMU +\ See license at end of file + +\ pc-linux sets the default values for the configuration variables +\ that control the boot device to boot vmlinuz from drive A. +create pc-linux + +\ - ELF format (no pheader) - ROM - LinuxBIOS direct +create linuxbios-loaded + +\ Load and run in qemu +create qemu-loaded + +\ LinuxBIOS+OFW under QEMU currently does not do VGA right +create serial-console + +\ In virtual mode, OFW runs with the MMU on. The advantages are +\ that OFW can automatically locate itself out of the way, at the +\ top of physical memory, it can dynamically allocate exactly as +\ much physical memory as it needs, and it can remain alive after +\ the OS starts. The disadvantage is that it is more confusing - +\ you always have to be aware of the distinction between virtual +\ and physical addresses. + +\ If you use virtual mode for Linux, you can debug past +\ the point where Linux starts using the MMU. It is not strictly +\ necessary to use virtual mode if you just want to boot Linux +\ and then have OFW disappear. + +\ create virtual-mode + +\ linux-support includes a bzImage file-format handler +\ and ext2 filesystem support + +create linux-support + +\ create pseudo-nvram +create resident-packages +create addresses-assigned \ Don't reassign PCI addresses +create use-root-isa +create use-isa-ide +create use-ega +create use-elf +create use-ne2000 +create use-watch-all +create use-null-nvram +create no-floppy-node + +fload ${BP}/cpu/x86/pc/biosload/addrs.fth + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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

r1050 - cpu/arm/Linux cpu/arm/build cpu/x86 cpu/x86/pc cpu/x86/pc/emu cpu/x86/pc/emu/build dev/isa dev/ne2000 dev/video dev/video/build dev/video/common dev/video/controlr
by svn＠openfirmware.info Dec. 28, 2008

Dec. 28, 2008

Author: wmb Date: 2008-12-28 04:58:44 +0100 (Sun, 28 Dec 2008) New Revision: 1050 Added: cpu/x86/pc/emu/ cpu/x86/pc/emu/addrs.fth cpu/x86/pc/emu/build/ cpu/x86/pc/emu/build/Makefile cpu/x86/pc/emu/config.fth cpu/x86/pc/emu/devices.fth cpu/x86/pc/emu/emuofw.bth cpu/x86/pc/emu/fw.bth cpu/x86/pc/emu/pcinode.fth cpu/x86/pc/emu/pmreset.bth cpu/x86/pc/emu/probemem.fth cpu/x86/pc/emu/rmreset.bth cpu/x86/startmacros.fth dev/isa/soundblaster.fth dev/ne2000/build/ dev/ne2000/ne2kpci.bth dev/ne2000/ne2kpci.fth dev/video/build/video.bth dev/video/cirrus.bth dev/video/controlr/cirruspci.fth dev/video/loadcirrus.fth Modified: cpu/arm/Linux/ cpu/arm/build/ cpu/x86/pc/linux.fth dev/video/common/pci.fth dev/video/controlr/cirrus.fth dev/video/controlr/vga.fth Log: Added a new platform directory "cpu/x86/pc/emu" for building a version that can run as a direct ROM image under QEMU and perhaps eventually VirtualBox and VMWare. Also added some drivers in support of that version, notably ne2000 Ethernet, Cirrus video, and SoundBlaster. Property changes on: cpu/arm/Linux ___________________________________________________________________ Added: svn:ignore + armforth forth Property changes on: cpu/arm/build ___________________________________________________________________ Added: svn:ignore + armbuild build Added: cpu/x86/pc/emu/addrs.fth =================================================================== --- cpu/x86/pc/emu/addrs.fth (rev 0) +++ cpu/x86/pc/emu/addrs.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,65 @@ +\ See license at end of file +purpose: Establish address and I/O configuration definitions + +\ Dropin-base is where the set of dropin modules, the verbatim +\ image of what is stored in ROM or on disk, ends up in memory. +\ If OFW is in FLASH, dropin-base can just be the FLASH address. +\ If OFW is pulled in from disk, dropin-base is where the very +\ early startup code - the first few instructions in the image - +\ copies it to get it out of the way of things like OS load areas. + +h# fff8.0000 constant dropin-base \ Location of payload in FLASH +dropin-base h# 20 + constant ResetBase \ Location of "reset" dropin in ROM +h# 08.0000 constant dropin-size + +h# 1.0000 constant dma-base \ DMA heap +h# 8.0000 constant dma-size + +\ This is considerably more memory than Open Firmware needs +\ on platforms where you have a well bounded set of I/O devices. + +h# 20.0000 constant /fw-ram +h# 20.0000 constant heap-size + +[ifndef] virtual-mode +h# 200.0000 constant ramsize \ 32 MB +\ h# 2000.0000 constant ramsize \ 512 MB + +ramsize heap-size - constant heap-base \ Dynamic allocation heap +heap-base /fw-ram - constant fw-pa \ OFW dictionary location +[then] + +\ Where OFW initially loads an OS that it is going to boot +\ OFW will then move it to the address where the OS wants to run from. + +h# 100.0000 constant def-load-base + +fload ${BP}/cpu/x86/pc/virtaddr.fth + +[ifdef] virtual-mode +h# 3 constant pte-control \ Page table entry attributes +[then] + +\ LICENSE_BEGIN +\ Copyright (c) 2008 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 Property changes on: cpu/x86/pc/emu/build ___________________________________________________________________ Added: svn:ignore + build builton.fth emuofw.rom Added: cpu/x86/pc/emu/build/Makefile =================================================================== --- cpu/x86/pc/emu/build/Makefile (rev 0) +++ cpu/x86/pc/emu/build/Makefile 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,24 @@ +OS := $(shell uname) + +all: emuofw.rom + +emuofw.rom: FORCE build ../../../build/inflate.bin + ./build $@ + +../../../${OS}/forth: + @make -C ../../../${OS} forth + +../../../build/inflate.bin: + @make -C ../../../build inflate.bin + +build: ../../../${OS}/forth + @ln -sf ../../../${OS}/forth build + +clean: + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.c32 *.rom + +clean-all: clean + @make -C ../../../build clean + @make -C ../../../${OS} clean + +.PHONY: FORCE clean all clean-all Added: cpu/x86/pc/emu/config.fth =================================================================== --- cpu/x86/pc/emu/config.fth (rev 0) +++ cpu/x86/pc/emu/config.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,154 @@ +\ See license at end of file +purpose: Establish configuration definitions + +\ create pc \ Demo version for generic PC +\ create pc-linux \ Demo version for generic PC and Linux +\ create pc-serial \ Demo version for generic PC + +\ --- The environment that "boots" OFW --- +\ - Image Format - Example Media - previous stage bootloader + +create rom-loaded + +\ debug-startup enables early-startup reports on COM1 + +create debug-startup + +\ serial-console makes COM1 the default OFW console device + +\ create serial-console + +\ resident-packages causes a lot of support packages to be +\ precompiled into the Forth dictionary, instead of being +\ demand-loaded from dropin modules + +create resident-packages + +\ addresses-assigned suppresses PCI address autoconfiguration. +\ It is useful when OFW is loaded by lower-level firmware that +\ has already assigned PCI addresses. + +\ create addresses-assigned + +\ use-root-isa puts the ISA bus device node directly under the +\ device tree root (/isa), instead of under the PCI node (/pci/isa). +\ For modern machines, it is usually best not to define use-root-isa . + +\ create use-root-isa + +\ use-pci-isa puts the ISA bus device node under the PCI node (/pci/isa), +\ which is usually accurate for modern machines. + +create use-pci-isa + +\ use-timestamp-counter makes low-level timing operations use the +\ timestamp counter (TSC) register. This is a good thing for modern +\ CPUs that have that register. + +create use-timestamp-counter + +\ use-isa-ide enables support for a legacy IDE controller accessed +\ directly via I/O ports. It is usually better to use the PCI IDE +\ controller support via a dynamically-bound FCode driver. + +\ create use-isa-ide + +\ use-ega enables support for an OFW console that uses EGA text-mode +\ This typically only works when OFW is loaded on top of a conventional +\ BIOS, because it assumes that the display device is already in the +\ correct mode and OFW can just start writing to the text mode framebuffer. + +\ create use-ega + +\ use-vga enables support for an OFW console on a legacy VGA device, +\ with OFW initializing the VGA registers to establish the mode. +\ This does not work very well. It is better to bind the "super driver" +\ (dev/video/build/video.fc) to the PCI display class code. + +\ create use-vga + +\ use-elf enables support for loading and debugging ELF binaries + +create use-elf + +\ use-ne2000 enables support for a legacy ISA bus NE2000 network interface + +\ create use-ne2000 + +\ use-watch-all enables the "watch-all" diagnostic command that +\ exercises a variety of common I/O devices. + +\ create use-watch-all + +\ use-null-nvram installs stub implementations of non-volatile +\ access routines, thus disabling persistent storage of OFW +\ configuration variables. Generic PCs generally have no good +\ place to store those configuration variables, as the CMOS RAM +\ is too small for typical string-valued variables. + +create use-null-nvram + +\ pseudo-nvram installs non-volatile access routines that use +\ a fixed-name file on drive A to store the data. It is a +\ reasonable way to enable configuration variable storage +\ when running OFW under an emulator where such a drive is +\ "always" present, but it is not particularly useful for +\ real hardware platforms. + +\ create pseudo-nvram + + +\ no-floppy-node prevents the creation of a floppy disk device node +\ among the set of legacy ISA devices. Modern PCs rarely have +\ floppy drives. + +\ create no-floppy-node + +\ In virtual mode, OFW runs with the MMU on. The advantages are +\ that OFW can automatically locate itself out of the way, at the +\ top of physical memory, it can dynamically allocate exactly as +\ much physical memory as it needs, and it can remain alive after +\ the OS starts. The disadvantage is that it is more confusing - +\ you always have to be aware of the distinction between virtual +\ and physical addresses. + +\ If you use virtual mode for Linux, you can debug past the point +\ where Linux starts using the MMU. It is not strictly +\ necessary to use virtual mode if you just want to boot Linux +\ and then have OFW disappear. + +create virtual-mode + +\ linux-support enables support for ext2 filesystems and bzimage format + +create linux-support + + +\ cpu/x86/pc/<platform>/addrs.fth configures the basic system +\ address assignment. + +fload ${BP}/cpu/x86/pc/emu/addrs.fth + +\ LICENSE_BEGIN +\ Copyright (c) 2008 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/x86/pc/emu/devices.fth =================================================================== --- cpu/x86/pc/emu/devices.fth (rev 0) +++ cpu/x86/pc/emu/devices.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,325 @@ +\ See license at end of file +purpose: Load device drivers according to configuration definitions + +fload ${BP}/cpu/x86/pc/isaio.fth + +fload ${BP}/dev/pci/configm1.fth \ Generic PCI configuration access + +0 0 " " " /" begin-package + fload ${BP}/cpu/x86/pc/mappci.fth \ Map PCI to root + fload ${BP}/dev/pcibus.fth \ Generic PCI bus package + +[ifdef] addresses-assigned + \ Suppress PCI address assignment; use the addresses the BIOS assigned + patch false true master-probe + patch noop assign-all-addresses prober + patch noop clear-addresses populate-device-node + patch noop clear-addresses populate-device-node + patch noop temp-assign-addresses find-fcode? + patch 2drop my-w! populate-device-node + : or-w! ( bitmask reg# -- ) tuck my-w@ or swap my-w! ; + patch or-w! my-w! find-fcode? + patch 2drop my-w! find-fcode? +[then] + + fload ${BP}/cpu/x86/pc/biosload/pcinode.fth \ System-specific words for PCI +end-package +stand-init: PCI host bridge + " /pci" " init" execute-device-method drop +; + +fload ${BP}/dev/pciprobe.fth \ Generic PCI probing + +[ifdef] use-timestamp-counter +\ Use the CPU chip's Time Stamp Counter for timing; it does just what we want +fload ${BP}/cpu/x86/tsc.fth +[then] + +[ifdef] use-ega +0 0 " " " /" begin-package + fload ${BP}/dev/egatext.fth +end-package +devalias screen /ega-text +[then] + +[ifdef] use-root-isa +0 0 " " " /" begin-package + fload ${BP}/cpu/x86/pc/isabus.fth \ ISA Bus Bridge under root node +end-package +[then] + +[ifndef] use-timestamp-counter +fload ${BP}/cpu/x86/pc/getms.fth +[then] + +[ifdef] use-pci-isa + +\ This must precede isamisc.fth in the load file, to execute it first +fload ${BP}/cpu/x86/pc/moveisa.fth + +0 0 " 0" " /pci" begin-package + fload ${BP}/dev/pci/isa.fth \ ISA bus bridge under PCI node + fload ${BP}/dev/pci/isamisc.fth +end-package +[then] + +[ifdef] use-pc87560 +0 0 " 5,1" " /pci" begin-package \ ISA bus bridge + fload ${BP}/dev/pc87560.fth \ SouthBridge ISA bus bridge +end-package +[then] + +dev /interrupt-controller +h# 20 to vector-base0 +h# 28 to vector-base1 +device-end + +[ifdef] use-pc87317 +fload ${BP}/dev/pc87317.fth \ National PC87317 superIO +[then] + +0 0 dropin-base <# u#s u#> " /" begin-package + " flash" device-name + + dropin-size + dup value /device + constant /device-phys + my-address my-space /device-phys reg +\ fload ${BP}/cpu/x86/pc/flashpkg.fth + fload ${BP}/dev/flashpkg.fth +end-package + +[ifdef] notdef +\ Create a node below the top-level FLASH node to accessing the portion +\ containing the dropin modules +0 0 0 0 " flash" begin-package + " dropins" device-name + + dropin-size constant /device + fload ${BP}/dev/subrange.fth +end-package +[then] + +\ devalias dropins /dropins +devalias dropins /flash + +\ Create a pseudo-device that presents the dropin modules as a filesystem. +fload ${BP}/ofw/fs/dropinfs.fth + +\ This devalias lets us say, for example, "dir rom:" +devalias rom /dropin-fs + +fload ${BP}/cpu/x86/forthint.fth \ Low-level interrupt handling code +fload ${BP}/dev/isa/irq.fth \ ISA interrupt dispatcher +fload ${BP}/cpu/x86/pc/isatick.fth \ Use ISA timer as the alarm tick timer + +[ifdef] resident-packages +support-package: 16550 +fload ${BP}/dev/16550pkg/16550.fth \ Serial port support package +end-support-package +[then] + +fload ${BP}/dev/pci/isaall.fth +devalias seriala /isa/serial@i3f8 +devalias com1 /isa/serial@i3f8:115200 +devalias serialb /isa/serial@i2f8 +devalias com2 /isa/serial@i2f8 +devalias a /isa/fdc/disk@0 +devalias b /isa/fdc/disk@1 +devalias mouse /isa/8042/mouse + +[ifdef] use-timestamp-counter +fload ${BP}/cpu/x86/pc/tsccal1.fth +[then] + +[ifdef] use-ega +dev /8042 patch false ctlr-selftest open device-end +[then] + +[ifdef] use-16552 +0 0 " i3a0" " /isa" begin-package + 3 encode-int 0 encode-int encode+ " interrupts" property + fload ${BP}/dev/16550pkg/ns16550p.fth + fload ${BP}/dev/16550pkg/isa-int.fth +end-package + +0 0 " i3a8" " /isa" begin-package + 4 encode-int 0 encode-int encode+ " interrupts" property + fload ${BP}/dev/16550pkg/ns16550p.fth + fload ${BP}/dev/16550pkg/isa-int.fth +end-package + +devalias seriald /isa/serial@i3a0 : seriald " seriald" ; +devalias serialc /isa/serial@i3a8 : serialc " serialc" ; +[then] + +0 0 " i70" " /isa" begin-package \ Real-time clock node + fload ${BP}/dev/ds1385r.fth + 8 encode-int 0 encode-int encode+ " interrupts" property + 2 encode-int " device#" property +end-package +stand-init: RTC + " /rtc" open-dev clock-node ! +; + +fload ${BP}/cpu/x86/pc/cpunode.fth + +[ifndef] serial-console +fload ${BP}/ofw/core/bailout.fth +stand-init: Keyboard overrides + ?bailout +; +[then] + +fload ${BP}/ofw/core/countdwn.fth \ Startup countdown +fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching +\ XXX remove the OS file commands from tools.dic +fload ${BP}/ofw/core/filecmds.fth \ File commands: dir, del, ren, etc. + +[ifdef] pseudo-nvram +fload ${BP}/cpu/x86/pc/biosload/filenv.fth +dev /file-nvram +: hd-nv-file ( -- ) " c:\nvram.dat" ; +' hd-nv-file to nv-file +device-end +stand-init: Pseudo-NVRAM + " /file-nvram" open-dev to nvram-node + nvram-node 0= if + ." The configuration EEPROM is not working" cr + then + ['] init-config-vars catch drop +; +[then] + +fload ${BP}/dev/isa/soundblaster.fth + +[ifdef] use-vga +0 0 " i3c0" " /isa" begin-package + " vga" name + my-address my-space h# 20 reg + fload ${BP}/dev/video/common/defer.fth \ Defered words + fload ${BP}/dev/video/common/graphics.fth \ Graphics and color routines + fload ${BP}/dev/video/controlr/vga.fth \ Controller code + use-vga + fload ${BP}/dev/video/common/init.fth \ Init code + fload ${BP}/dev/video/common/display.fth \ High level interface code + fload ${BP}/dev/video/common/textmode.fth \ VGA text mode + : (map-io-regs) h# ffff0000 to io-base ; + ' (map-io-regs) to map-io-regs +end-package +[then] + +[ifdef] use-ct65550 +0 0 " i3b0" " /isa" begin-package + fload ${BP}/dev/ct6555x/loadpkg.fth \ Video driver +end-package +devalias screen /isa/display \ Explicit, because it's not probed +[then] + +[ifdef] use-es1887 +fload ${BP}/dev/isa/es1887.fth \ Sound chip driver +devalias audio /isa/sound +fload ${BP}/cpu/x86/decnc/sound.fth \ Startup sound +[then] + +[ifdef] use-isa-ide +0 0 " i1f0" " /isa" begin-package + fload ${BP}/dev/ide/isaintf.fth + fload ${BP}/dev/ide/generic.fth + 2 to max#drives + fload ${BP}/dev/ide/onelevel.fth +end-package +\ One-level IDE +[then] + +\ Create the alias unless it already exists +: $?devalias ( alias$ value$ -- ) + 2over not-alias? if $devalias exit then ( alias$ value$ alias$ ) + 2drop 4drop +; + +: report-pci-fb ( -- ) + " /pci/display" locate-device 0= if ( phandle ) + " open" rot find-method if ( xt ) + drop + " screen" " /pci/display" $devalias + then + then +; + +: report-disk ( -- ) + " /scsi" locate-device 0= if + drop + " scsi" " /scsi" $devalias + " disk" " /scsi/disk@0" $devalias + " c" " /scsi/disk@0" $devalias + " d" " /scsi/disk@1" $devalias + " e" " /scsi/disk@2" $devalias + " f" " /scsi/disk@3" $devalias + exit + then + " /pci-ide" locate-device 0= if + drop + " disk" " /pci-ide/ide@0/disk@0" $devalias + " c" " /pci-ide/ide@0/disk@0" $devalias + " d" " /pci-ide/ide@0/disk@1" $devalias + " e" " /pci-ide/ide@1/disk@0" $devalias + " f" " /pci-ide/ide@1/disk@1" $devalias + exit + then + " /ide" locate-device 0= if + drop + " disk" " /ide@1f0/disk@0" $devalias + " c" " /ide@1f0/disk@0" $devalias + " d" " /ide@170/disk@1" $devalias + " e" " /ide@1f0/disk@0" $devalias + " f" " /ide@170/disk@2" $devalias + exit + then +; + +fload ${BP}/cpu/x86/inoutstr.fth \ Multiple I/O port read/write +[ifdef] use-isa-ide +dev /ide +' pseudo-dma-in ' pseudo-dma-out set-blk-w +device-end +[then] + +[ifdef] use-ne2000 +0 0 " i300" " /isa" begin-package + start-module + fload ${BP}/dev/ne2000/ne2000.fth \ Ethernet Driver + end-module +end-package +[then] + +fload ${BP}/dev/isa/diaguart.fth \ ISA COM port driver +h# 3f8 is uart-base +fload ${BP}/forth/lib/sysuart.fth \ Use UART for key and emit +\ fload ${BP}/cpu/x86/pc/egauart.fth \ Output also to EGA + +fload ${BP}/cpu/x86/pc/reset.fth \ reset-all + +\ LICENSE_BEGIN +\ Copyright (c) 2008 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/x86/pc/emu/emuofw.bth =================================================================== --- cpu/x86/pc/emu/emuofw.bth (rev 0) +++ cpu/x86/pc/emu/emuofw.bth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,110 @@ +purpose: Construct the final OFW image + +command: &builder &this +\ in: biostart.img +in: rmreset.img +in: pmreset.di +in: paging.di +in: fw.img +in: ${BP}/dev/usb2/hcd/ohci/build/ohci.fc +in: ${BP}/dev/usb2/hcd/uhci/build/uhci.fc +in: ${BP}/dev/usb2/hcd/ehci/build/ehci.fc +in: ${BP}/dev/usb2/device/hub/build/hub.fc +in: ${BP}/dev/usb2/device/net/build/usbnet.fc +in: ${BP}/dev/usb2/device/serial/build/usbserial.fc +in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc +in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +\ in: ${BP}/ofw/fs/nfs/build/nfs.di +\ in: ${BP}/ofw/fs/cdfs/build/cdfs.di +\ in: ${BP}/ofw/fs/fatfs/build/fatfs.di +\ in: ${BP}/ofw/disklabel/build/disklabel.di +\ in: ${BP}/ofw/inet/build/obptftp.di +in: ${BP}/dev/pci/build/pcibridg.fc +in: ${BP}/dev/ide/build/leghier.fc +in: ${BP}/dev/video/build/cirrus.fc +in: ${BP}/dev/ne2000/build/ne2kpci.fc +in: ${BP}/dev/amd79970/build/vmlance.fc +\ in: ${BP}/dev/video/build/video.fc +in: ${BP}/cpu/x86/pc/biosload/linux.fth + +build-now + +fload ${BP}/cpu/x86/pc/emu/config.fth + +\ Always re-create the builton.fth file when we make a new rom.img +fload ${BP}/cpu/x86/pc/builton.bth + +hex + +: pad-file ( location -- ) + ofd @ fsize + 2dup u< abort" The ROM image is too large" + ?do h# ff ofd @ fputc loop +; + +.( --- Saving as emuofw.rom - Binary ROM image format for emulator) cr +writing emuofw.rom + " pmreset.di" $add-file + " paging.di" $add-file + " ${BP}/cpu/x86/build/inflate.bin" " inflate" $add-dropin + " fw.img" " firmware" $add-deflated-dropin + " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin + " ${BP}/dev/ide/build/leghier.fc" " class010180" $add-deflated-dropin + +\ The super-driver is overkill, we don't need support for lots of obsolete video cards +\ " ${BP}/dev/video/build/video.fc" " class030000" $add-deflated-dropin + +\ Just use a driver targeted at the specific chipset that QEMU emulates + " ${BP}/dev/video/build/cirrus.fc" " pci1013,b8" $add-deflated-dropin + + " ${BP}/dev/ne2000/build/ne2kpci.fc" " pci10ec,8029" $add-deflated-dropin + " ${BP}/dev/amd79970/build/vmlance.fc" " pci1022,2000" $add-deflated-dropin + + " ${BP}/dev/usb2/hcd/uhci/build/uhci.fc" " class0c0300" $add-deflated-dropin + " ${BP}/dev/usb2/hcd/ohci/build/ohci.fc" " class0c0310" $add-deflated-dropin + " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin + + " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin + " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin + " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin + + " builton.fth" " probe-" $add-dropin +[ifndef] resident-packages + " ${BP}/ofw/fs/cdfs/build/cdfs.di" $add-file + " ${BP}/ofw/fs/fatfs/build/fatfs.di" $add-file + " ${BP}/ofw/fs/nfs/build/nfs.di" $add-file + " ${BP}/ofw/fs/dropinfs.fth" " dropin-file-system" $add-deflated-dropin + " ${BP}/ofw/disklabel/build/disklabel.di" $add-file + " ${BP}/ofw/inet/build/obptftp.di" $add-file + " ${BP}/dev/16550pkg/16550.fth" " 16550" $add-deflated-dropin + " ${BP}/cpu/x86/disassem.fth" " disassem.fth" $add-deflated-dropin + " ${BP}/ofw/ppp/build/ppp.di" $add-file +\ " ${BP}/ofw/fs/ufs/ufs.fth" " ufs-file-system" $add-deflated-dropin + " ${BP}/ofw/fs/zipfs.fth" " zip-file-system" $add-deflated-dropin + " ${BP}/ofw/inet/tcp.fth" " tcp" $add-deflated-dropin + " ${BP}/ofw/inet/http.fth" " http" $add-deflated-dropin + " ${BP}/ofw/fs/ext2fs/ext2fs.fth" " ext2-file-system" $add-deflated-dropin + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + " ${BP}/ofw/fs/fatfs/fdisk2.fth" " fdisk2.fth" $add-deflated-dropin +[then] + " ${BP}/ofw/fcode/memtest.fth" " memtest.fth" $add-deflated-dropin + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + + " ${BP}/ofw/inet/httpdemo/index.htm" " index.htm" $add-dropin + " ${BP}/ofw/inet/httpdemo/config.htm" " config.htm" $add-dropin +\ " ${BP}/ofw/inet/httpdemo/post.htm" " post.htm" $add-dropin + " ${BP}/ofw/inet/httpdemo/free.htm" " free.htm" $add-dropin + " ${BP}/ofw/inet/httpdemo/homelogo.gif" " homelogo.gif" $add-dropin + + " ${BP}/cpu/x86/pc/biosload/linux.fth" " linux.fth" $add-dropin + " ${BP}/ofw/linux/penguin.txt" " penguin.txt" $add-dropin + + " ${BP}/ofw/termemu/cp881-16.obf" " font" $add-deflated-dropin + + h# 7.fc00 pad-file + " rmreset.img" $add-file + ofd @ fsize dropin-size <> if ." Size is wrong" cr then +ofd @ fclose Added: cpu/x86/pc/emu/fw.bth =================================================================== --- cpu/x86/pc/emu/fw.bth (rev 0) +++ cpu/x86/pc/emu/fw.bth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,361 @@ +\ See license at end of file +purpose: Build Open Firmware core for PC + +dictionary: ${BP}/cpu/x86/build/basefw.dic +command: &x86forth &dictionary &this +in: builton.fth +build-now + +hex +\ ' $report-name is include-hook + +fload ${BP}/cpu/x86/pc/emu/config.fth + +: headerless ; : headers ; : headerless0 ; + +' (quit) to quit + +create debug-startup +: \Tags [compile] \ ; immediate +: \NotTags [compile] \ ; immediate + +: RAMbase ( -- adr ) fw-virt-base ; +: RAMtop ( -- adr ) RAMbase /fw-ram + ; + +h# 00.0000 value dp-loc \ Set in patchboot +: stacktop ( -- adr ) RAMtop ; +: dict-limit ( -- adr ) RAMtop h# 06.0000 - ; + +\ XXX What we should do is pass in the top address in SP, and have +\ boot.fth allocate the user area by subtracting user-size. But +\ we need some way of finding it again for exception re-entry. +\ prom-main-task is used in arch/pc/boot.fth . The constant +\ value is wired into the assembly code +stacktop user-size - ( fw-virt-base - ) constant prom-main-task \ user area for main task + +0 value load-limit \ Top address of area at load-base +' 2drop to sync-cache + +def-load-base ' load-base set-config-int-default + +true ' fcode-debug? set-config-int-default +\ false ' auto-boot? set-config-int-default + +[ifdef] serial-console +" com1" ' output-device set-config-string-default +" com1" ' input-device set-config-string-default +[then] + +\ XXX should be loaded by basefw.bth +fload ${BP}/cpu/x86/initpgm.fth \ Basic boot handler + +: (cpu-arch ( -- adr len ) + " architecture" ['] root-node get-package-property drop + get-encoded-string +; +' (cpu-arch to cpu-arch + +h# 1000 to pagesize +d# 12 to pageshift + +dev / +1 encode-int " #address-cells" property + +" Emulated PC" model +" PC" encode-string " architecture" property + +\ XXX figure out bus frequency. How? +\ d# 33,333,333 " clock-frequency" integer-property +device-end + +\ Memory management services +[ifdef] virtual-mode +fload ${BP}/ofw/core/clntmem1.fth \ client services for memory +[else] +fload ${BP}/ofw/core/clntphy1.fth \ client services for memory +[then] +fload ${BP}/ofw/core/memlist.fth \ Resource list common routines +fload ${BP}/ofw/core/showlist.fth \ Linked list display tool +fload ${BP}/ofw/core/allocph1.fth \ S Physical memory allocator +fload ${BP}/ofw/core/availpm.fth \ Available memory list + +fload ${BP}/cpu/x86/pc/rootnode.fth \ Platform-specific root node changes + +fload ${BP}/cpu/x86/pc/emu/probemem.fth \ Memory probing + +[ifdef] virtual-mode +fload ${BP}/cpu/x86/loadvmem.fth \ /mmu node +stand-init: MMU + " /mmu" open-dev mmu-node ! +; +fload ${BP}/cpu/x86/pc/initdict.fth \ Dynamic dictionary allocation +[then] + +\ XXX should be elsewhere +dev /client-services +: chain ( len args entry size virt -- ) + release ( len args entry ) + h# 8000 alloc-mem h# 8000 + (init-program) ( len args ) + to %ebx to %ecx + go +; +device-end + +fload ${BP}/cpu/x86/crc32.fth \ Assembly language Zip CRC calculation +fload ${BP}/forth/lib/crc32.fth \ High-level portion of CRC calculation + +[ifdef] resident-packages + +[ifdef] use-ufs +support-package: ufs-file-system + fload ${BP}/ofw/fs/ufs/ufs.fth \ Unix file system +end-support-package +[then] + +[ifdef] linux-support +\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation +support-package: ext2-file-system + fload ${BP}/ofw/fs/ext2fs/ext2fs.fth \ Linux file system +end-support-package +[then] + +support-package: zip-file-system + fload ${BP}/ofw/fs/zipfs.fth \ Zip file system +end-support-package + +support-package: dropin-file-system + fload ${BP}/ofw/fs/dropinfs.fth \ Dropin file system +end-support-package +[then] + +\ Load file format handlers + +: call32 ; + +fload ${BP}/ofw/core/allocsym.fth \ Allocate memory for symbol table +fload ${BP}/ofw/core/symcif.fth +fload ${BP}/ofw/core/symdebug.fth +: release-load-area ( boundary-adr -- ) drop ; + +fload ${BP}/cpu/x86/pc/fixkbd.fth \ Switch keyboard scan codes + +[ifdef] use-elf +fload ${BP}/ofw/elf/elf.fth +fload ${BP}/ofw/elf/elfdebug.fth +[ifdef] virtual-mode +\ Depends on the assumption that physical memory is mapped 1:1 already +: (elf-map-in) ( va size -- ) 0 mem-claim drop ; +' (elf-map-in) is elf-map-in +[else] +' 2drop is elf-map-in +[then] +[then] + +\ Reboot and re-entry code +fload ${BP}/cpu/x86/pc/reboot.fth \ Restart the client program +fload ${BP}/cpu/x86/pc/reenter.fth \ Various entries into Forth + +headerless +[ifdef] virtual-mode +: (initial-heap) ( -- adr len ) + mem-info-pa la1+ l@ heap-size - ( adr ) + dup mem-info-pa la1+ l! ( adr ) + heap-size +; +[else] +: (initial-heap) ( -- adr len ) heap-base heap-size ; +[then] +' (initial-heap) is initial-heap +headers + +" /openprom" find-device + " FirmWorks,3.0" encode-string " model" property +device-end + +[ifdef] virtual-mode +fload ${BP}/cpu/x86/pc/mmusetup.fth \ Initial values for MMU lists +[then] + +fload ${BP}/cpu/x86/pc/emu/devices.fth + +fload ${BP}/dev/scsi/probscsi.fth \ probe-scsi and probe-scsi-all + +true ' local-mac-address? set-config-int-default +[ifdef] resident-packages +support-package: nfs + fload ${BP}/ofw/fs/nfs/loadpkg.fth +end-support-package +[then] +devalias nfs net//obp-tftp:last//nfs + +fload ${BP}/ofw/inet/loadtcp.fth + +support-package: http + fload ${BP}/ofw/inet/http.fth \ HTTP client +end-support-package + +[ifndef] use-timestamp-counter +fload ${BP}/cpu/x86/pc/mscal.fth +[then] +fload ${BP}/cpu/x86/pc/boot.fth + +hex +\ If there is a PCI ethernet adapter, use it as the default net device, +\ otherwise use any ethernet that can be found in the device tree. +: report-net ( -- ) + " /pci/ethernet" 2dup find-package if ( name$ phandle ) + drop ( name$ ) + else ( name$ ) + 2drop " /ethernet" ( name$' ) + then ( name$ ) + " net" 2swap $devalias ( ) +; + +fload ${BP}/cpu/x86/pc/biosload/usb.fth + +\ false to stand-init-debug? +true to stand-init-debug? + +hex +stand-init-debug? [if] +warning @ warning off +: init +\ initial-heap add-memory + init + + standalone? if + cr ." Type 'i' to interrupt stand-init sequence" cr + d# 2000 ms + key? if + key upc ascii I = if ." Interacting" cr hex interact then + then + then + +\ cr0@ h# 9fff.ffff and cr0! \ enable L1 and L2 caches + +; +warning ! +[then] + +[ifdef] virtualbox-loaded +also hidden also keys-forth definitions +\ The VirtualBox "serial port" can be accessed via a telnet client. +\ Telnet normally sends CR-LF at the end of the line and it is hard +\ to turn that off because of incompatibilies between various clients +\ and servers. So if there is a key already queued up right after a +\ newline, we just eat it. +: telnet-newline ( -- ) + new-line-or-done key? if key drop then +; +warning @ warning off +: ^m telnet-newline ; +: ^j telnet-newline ; +warning ! +previous previous definitions +[then] + +: (.firmware) ( -- ) + ." Open Firmware " .built cr + ." Copyright 1999 FirmWorks All Rights Reserved" cr +; +' (.firmware) to .firmware + +: linux-logo ( -- ) + " penguin.txt" find-drop-in if page type then +; + +: probe-all ( -- ) + " probe-" do-drop-in + ." probe-pci" cr +\ debug-me + probe-pci +[ifdef] probe-isa-modem + probe-isa-modem +[then] + probe-usb + report-disk + report-net + report-pci-fb +; + +: startup ( -- ) + standalone? 0= if exit then +\ ." calibrate-ms" cr +\ calibrate-ms + + ." nvramrc" cr + use-nvramrc? if nvramrc safe-evaluate then + + auto-banner? if + " Probing" ?type probe-all + " Install console" ?type install-console + banner + then + + hex + warning on + only forth also definitions + +\ install-alarm + + #line off + + ." Open Firmware demonstration version by FirmWorks (info(a)firmworks.com)" cr + + quit +; + +[ifdef] use-watch-all +fload ${BP}/cpu/x86/pc/watchall.fth +[then] + +alias crcgen drop ( crc byte -- crc' ) +fload ${BP}/cpu/x86/pc/saveabs.fth + +fload ${BP}/forth/lib/selstr.fth + +[ifdef] pc-linux +" a:\initrd.imz" d# 128 config-string ramdisk +" root=/dev/ram0 mount_ramdisk=1" ' boot-file set-config-string-default +" a:\vmlinuz" ' boot-device set-config-string-default +true ' client-symbols? set-config-int-default +\ Also try " console=/dev/ttyS0,9600 console=/dev/tty0" in boot-file +[then] + +[ifdef] linux-support +fload ${BP}/cpu/x86/pc/linux.fth +[then] + +fload ${BP}/cpu/x86/pc/biosload/vmdoor.fth \ VMware interfaces + +" dhcp" ' ip-address set-config-string-default + +.( SAVING FW.dic ...) +" fw.dic" $save-forth cr + +.( Saving fw.img ...) +" fw.img" RAMbase save-abs-rom cr + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/x86/pc/emu/pcinode.fth =================================================================== --- cpu/x86/pc/emu/pcinode.fth (rev 0) +++ cpu/x86/pc/emu/pcinode.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,115 @@ +\ See license at end of file +purpose: PCI bus package + +also forth definitions + +\ probe all slots +" 0,1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,10,11,12,13,14,15,16,17,18,19,1a,1b,1c,1d,1e,1f" +\ " 1,2,3,4,5,6,7,8,9,a,b,c,d,e,f" + dup config-string pci-probe-list + +previous definitions + +h# c000.0000 to first-mem \ Avoid RAM at low addresses +h# e000.0000 to mem-space-top +h# 0000.8000 to first-io \ Avoid mappings established by BIOS + +defer config-setup +defer config-done + +\ Configuration mechanism #1 as defined in the PCI spec. +: config-setup1 ( config-adr -- vaddr ) + \ Bit 31 ("enable") must be 1, bits 30:24 ("reserved") must be 0, + \ bits 1:0 must be 0. + dup h# ff.fffc and h# 8000.0000 or h# cf8 pl! ( config-adr ) + + 3 and h# cfc + \ Merge in the byte selector bits +; + +\ These versions of config-x@/! are for "configuration mechanism #2" +\ as described in the PCI design guide. That mechanism is not the +\ recommended one, but several PC PCI chipsets use it. + +: config-setup2 ( bus#|dev#|function|reg# -- port-adr ) + \ XXX For now, we ignore the bus number + \ Write function number and "access config space" key to the config + \ space enable register + dup 7 >> h# e and h# 10 or h# cf8 pc! ( bus#|dev#|function#|reg#) + dup h# ff and swap d# 11 >> h# f and 8 << or h# c000 or +; +: config-done2 ( -- ) 0 h# cf8 pc! ; + +: config-b@ ( config-adr -- b ) config-setup pc@ config-done ; +: config-w@ ( config-adr -- w ) config-setup pw@ config-done ; +: config-l@ ( config-adr -- l ) config-setup pl@ config-done ; +: config-b! ( b config-adr -- ) config-setup pc! config-done ; +: config-w! ( w config-adr -- ) config-setup pw! config-done ; +: config-l! ( l config-adr -- ) config-setup pl! config-done ; + +: mechanism1 ( -- ) + ['] config-setup1 to config-setup + ['] noop to config-done +; +mechanism1 +: mechanism2 ( -- ) + ['] config-setup2 to config-setup + ['] config-done2 to config-done +; + +\ !!! assumes a device in either slot 0 or slot 1 !!! +\ and that failed reads return -1. +: init ( -- ) + mechanism1 + 0 config-l@ -1 = h# 800 config-l@ -1 = and if + mechanism2 +\ h# 0000.5000 to first-io \ Avoid on-board SCSI chip's BIOS mapping +\ " 3,4,5" to pci-probe-list + then +; + +\ Determine the parent interrupt information (the "interrupt line" in PCI +\ parlance) from the child's "interrupt pin" and the child's address, +\ returning "int-line true" if the child's interrupt line register should +\ be set or "false" otherwise. +: assign-int-line ( phys.hi.func INTx -- irq true ) + \ Reiterate the value that is already in the int line register, + \ which was presumably placed there by the BIOS + drop h# 3c + config-b@ true +; + +\ XXX we should keep a table of already-mapped addresses so that +\ successive map/unmaps of the same address will succeed. + + +\ The io-base handling really ought to be in the root node, but +\ that would require more changes than I'm willing to do at present. +warning @ warning off +: map-out ( vaddr size -- ) + over io-base u>= if 2drop exit then ( vaddr size ) + map-out ( ) +; +warning ! + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/x86/pc/emu/pmreset.bth =================================================================== --- cpu/x86/pc/emu/pmreset.bth (rev 0) +++ cpu/x86/pc/emu/pmreset.bth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,156 @@ +\ See license at end of file +purpose: Build file for dropin dispatcher - version for direct ROM startup + +command: &builder &this +build-now + +fload ${BP}/cpu/x86/pc/emu/config.fth + +\ If debug-startup is not defined in config.fth, the "init-com1" and "report" +\ macros will be noops; otherwise they will generate COM port access code. + +\needs start-assembling fload ${BP}/cpu/x86/asmtools.fth +\needs write-dropin fload ${BP}/forth/lib/mkdropin.fth + +fload ${BP}/cpu/x86/mmuparam.fth + +\ startmacros.fth defines some assembler macros that make it easy to +\ access MSRs, I/O ports, and PCI config registers. + +fload ${BP}/cpu/x86/startmacros.fth + +hex + +fload ${BP}/cpu/x86/pc/finddi.fth \ find-dropin and other tools + +h# 3e.0000 constant inflate-base \ Where to put the inflater in memory +h# 30.0000 constant workspace \ when inflating the Forth part of OFW + +start-assembling + +label my-entry + h# e9 c, 0 l, \ Skip support subroutines, jmp offset patched later +end-code + +[ifdef] debug-startup +fload ${BP}/cpu/x86/pc/dot.fth \ Numeric output +[then] + +fload ${BP}/cpu/x86/pc/romfind.fth \ Support subroutine: find-dropin + +label startup \ Target of jmp instruction at my-entry + h# 10 port80 + +\ Perform low-level initialization of bridges here, typically at least +\ to the level where it's possible to talk to the COM port + + h# 12 port80 + + init-com1 + carret report linefeed report + char F report + +\ Perform RAM controller initialization here. + + h# 14 port80 + char o report + + h# 80000 # sp mov \ Temporary stack pointer for debugging + +[ifdef] notdef + \ This is an example of how you could display numeric information + \ on the serial port during startup. This only works after memory + \ is turned on, because it requires a stack. Before memory is on, + \ you can display individual characters with "report", but not numbers. + ax push \ Save EAX because "dot" destroys it + dot #) call \ Display whatever is in EAX as a hex number + ax pop \ Restore saved EAX +[then] + + \ Determine the memory size + + \ Adjust assembler structured conditionals to permit long blocks + long-offsets on + + \ Set locations just below power-of-two boundaries to the boundary value + h# 8000.0000 # si mov \ Start address + h# 200.0000 # di mov \ End address (assume at least 32 MiB) + si ax mov + begin + ax -4 [ax] mov \ Set e.g. loc 3ffffffc to 40000000 + 1 # ax shr \ Step down to the next power of two + di ax cmp \ Stop at lower limit + < until + + \ Look for a location that contains the expected data + si ax mov + begin + -4 [ax] bx mov + bx ax cmp + <> while + 1 # ax shr + di ax cmp + < if + \ Halt with a message if we go below the end address + h# 1e port80 + bl report + char B report char A report char D report + char M report char E report char M report + begin hlt again + then + repeat + + \ Put the memory size where resetend.fth can find it + ax mem-info-pa #) mov \ Total size + ax mem-info-pa 4 + #) mov \ Allocation pointer + + \ Turn on the cache + cr0 ax mov + 6000.0000 bitclr \ Cache-disable off, coherent + ax cr0 mov + invd + + \ Now we can use the stack and do conventional subroutine calls + h# 16 port80 + char r report + + \ resetend.fth finds the Forth part of OFW, moves/uncompresses it + \ into RAM, and runs it. It's independent of board-specific + \ I/O hardware, so it can be shared between different board ports. + + fload ${BP}/cpu/x86/pc/resetend.fth +end-code + +also 386-assembler +startup my-entry put-branch +previous + +end-assembling + +writing pmreset.di +asm-base here over - 0 " pmreset" write-dropin +ofd @ fclose + +\ LICENSE_BEGIN +\ Copyright (c) 2008 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/x86/pc/emu/probemem.fth =================================================================== --- cpu/x86/pc/emu/probemem.fth (rev 0) +++ cpu/x86/pc/emu/probemem.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,66 @@ +\ See license at end of file +purpose: Create memory node properties and lists + +dev /memory + +: cmos@ ( offset -- byte ) h# 70 pc! h# 71 pc@ ; +: /ram ( -- #bytes ) mem-info-pa l@ ; + +: release-range ( start-adr end-adr -- ) over - release ; + +: probe ( -- ) + 0 /ram reg \ Report extant memory + + \ Put h# 10.0000-1f.ffff and 28.0000-memsize in pool, + \ reserving 0..10.0000 for the firmware + \ and 20.0000-27.ffff for the "flash" + +\ h# 0.0000 h# 02.0000 release \ A little bit of DMA space, we hope +\ h# 10.0000 h# 0f.ffff release +\ h# 28.0000 h# 80.0000 h# 28.0000 - release + +\ Release some of the first meg, between the page tables and the DOS hole, +\ for use as DMA memory. + mem-info-pa 2 la+ l@ h# a.0000 release-range \ Below DOS hole + +[ifdef] virtual-mode + h# 10.0000 mem-info-pa la1+ l@ over - release +[else] + fw-pa h# 10.0000 u> if + h# 10.0000 fw-pa over - release + fw-pa /fw-ram + heap-base heap-size + umax /ram release + then +[then] +; + +device-end + +also forth definitions +stand-init: Probing memory + " probe" memory-node @ $call-method +; +previous definitions + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/x86/pc/emu/rmreset.bth =================================================================== --- cpu/x86/pc/emu/rmreset.bth (rev 0) +++ cpu/x86/pc/emu/rmreset.bth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,260 @@ +\ See license at end of file +purpose: x86 real mode startup code. + +command: &builder &this +build-now + +fload ${BP}/cpu/x86/pc/emu/config.fth + +\ 386/486 processors begin executing at address ffff.fff0 in real mode +\ when they come out of reset. Normally, that address would not be +\ accessable in real mode, but the processor does some magic things to +\ the Code Segment register so that the high order address lines are +\ "boosted" up to the ffff.xxxx range just after reset. The "boosting" +\ persists until the CS register is modified (i.e. with a far jump). + +\ The other segment register are not "boosted", so they can only access +\ the normal real mode range, essentially just the first megabyte. + +\ The startup code must establish a Global Descriptor Table containing +\ suitable mappings, and then enter protected mode. The space between +\ ffff.fff0 and the end of the ROM is insufficient to do this, so the +\ first few instructions must jump elsewhere, to a place where there +\ is enough room. + +\ The code below is rather tricky, especially since the Forth assembler +\ always assumes 32-bit operand size and 32-bit addressing modes. +\ The code is executing in 16-bit mode, so the assembler must be used +\ carefully to ensure generation of the correct opcodes, and override +\ prefixes where necessary. + + +\needs start-assembling fload ${BP}/cpu/x86/asmtools.fth +\needs write-dropin fload ${BP}/forth/lib/mkdropin.fth + +hex + +start-assembling +hex + +\ Addresses where the following items will be located in the processor's +\ physical address space: + +\ ffff.fc00: GDT ( 3 entries ) + padding +\ ffff.fc20: GDT address + size ( 6 bytes ) plus padding +\ ffff.fc28: Startup code plus padding +\ ffff.fff0: Reset entry point - jump to startup code plus padding to end + +\ Assembler macros for startup diagnostics + +\ write a byte to an ISA port +: risa-c! ( n a - ) " # dx mov # al mov al dx out " evaluate ; + +: num>asc ( al: b -- al: low ah: hi ) + " al ah mov " evaluate + " h# f # al and " evaluate + " h# 9 # al cmp > if h# 57 # al add else h# 30 # al add then " evaluate + + " ah shr ah shr ah shr ah shr " evaluate \ shift down four bits + " h# f # ah and " evaluate + " h# 9 # ah cmp > if h# 57 # ah add else h# 30 # ah add then " evaluate + + " al bl mov ah al mov bl ah mov " evaluate + +; + +[ifdef] no-port80 +: port80 ( byte -- ) drop ; +[else] +: port80 ( byte -- ) " # al mov al h# 80 # out" evaluate ; +[then] + +\ The simple COM port initialization in this file assumes that the hardware +\ path to the COM port (southbridge+superIO or whatever) is active immediately +\ after reset, requiring no special initialization. That's usually not a good +\ assumption for modern machines. So it's often best to ignore the serial +\ debugging feature in this file, perhaps using it in later files after the +\ bridges have been set up. Port80 debug generally suffices herein. + +[ifdef] debug-reset +.( debug reports enabled ) cr +: init-com1 ( -- ) + 1 3fc risa-c! \ DTR on + 80 3fb risa-c! \ Switch to bank 1 to program baud rate + 01 3f8 risa-c! \ Baud rate divisor low - 115200 baud + 0 3f9 risa-c! \ Baud rate divisor high - 115200 baud + 3 3fb risa-c! \ 8 bits, no parity, switch to bank 0 +; +\ Assembler macro to assemble code to send the character "char" to COM1 +: report ( char -- ) + " begin 3fd # dx mov dx al in 20 # al and 0<> until" evaluate + ( char ) " # al mov 3f8 # dx mov al dx out " evaluate + " begin 3fd # dx mov dx al in 20 # al and 0<> until" evaluate +; +\ Put character in al +: reportc + " al ah mov " eval + " begin 3fd # dx mov dx al in 20 # al and 0<> until" evaluate + ( char ) " ah al mov 3f8 # dx mov al dx out " evaluate + " begin 3fd # dx mov dx al in 20 # al and 0<> until" evaluate +; +[else] +: report ( char -- ) drop ; +: reportc ( -- ) ; +[then] + +\ Real Mode Startup + +label rm-startup \ Executes in real mode with 16-bit operand forms + + \ ffff.fc00 GDT +hex + + 0 w, 0 l, 0 w, \ 0 Mandatory null descriptor + 0 w, 0 l, 0 w, \ * Another null descriptor + ffff w, 9b.000000 l, 00.c.f w, \ 10 Code, linear=physical, full 4Gbytes + ffff w, 93.000000 l, 00.c.f w, \ 18 Data, linear=physical, full 4Gbytes + + \ ffff.fc20 GDT limit + address + + 1f w, ffff.fc00 l, \ # slots (4 * 8 - 1) , starting address + 0 w, \ Padding + + \ ------->>>>> Startup code, reached by branch from main entry point below + \ + \ ffff.fc28 + + here \ Mark the beginning of this code so its size may be determined + \ and so that a jump to it may be assembled later. + + 16-bit + + h# 01 port80 + cld + +\ Normally it's best to keep this file short, thus minimizing the time spend +\ in 16-bit real mode (which is painful to program in). But some CPUs start +\ out with a really slow clock, only running fast after you turn on the PLL. +\ On such machines, if you are trying to achieve the fastest possible startup, +\ it makes sense to put the PLL turnon code here, thus minimizing the number +\ of instructions executed in slow mode. + + h# 02 port80 + +[ifdef] debug-reset +init-com1 +carret report \ send it to com1 if you can... +linefeed report \ send it to com1 if you can... +ascii F report \ send it to com1 if you can... +[then] + + \ The following instruction uses the CS: segment override because + \ that segment is currently "boosted" up into the ROM space. + \ It uses the operation size override to load a 32-bit pointer. + \ The address override is not used; the GDT limit/address data structure + \ above is reachable with a 16-bit address and through the "boosted" + \ code segment. + + op: cs: 0f c, 01 c, 16 c, fc20 w, \ lgdte cs:[fc20] Setup GDT + + op: cr0 bx mov \ Get existing CR0 value + + 1 # bl or \ Set "protected mode" bit + + bx cr0 mov \ Enter protected mode + ahead then \ jmp to next location to flush prefetch queue + \ note: CPL is now 0 + + h# 03 port80 + + \ We are in protected mode, but we are still executing from old + \ 16-bit code segment, and will continue to do so until the far jump + \ below + +[ifdef] debug-reset +ascii o report +[then] + + \ set segment registers + bx bx xor \ Clear high byte + h# 18 # bl mov \ Data segment selector + bx ds mov \ Set segment register + bx es mov \ Set segment register + bx fs mov \ Set segment register + bx gs mov \ Set segment register + +[ifdef] debug-reset +ascii r report +[then] + + bx ss mov \ Set segment register + +[ifdef] debug-reset +ascii t report +ascii h report +[then] + + h# 0f port80 + + op: ad: ResetBase h# 10 #) far jmp \ Jump to Forth startup + + \ Pad the startup code so that the main entry point ends up at the + \ correct address. + + here over - ( adr , size-of-preceding-code ) + + \ ffff.fc28 is the location of the code that follows the GDT + h# ffff.fff0 h# ffff.fc28 - swap - ( address #bytes-to-pad ) + + \ The code mustn't extend past ffff.ffc0, because that is where PC + \ manufacturers put the 0x10-byte BIOS version string. + dup h# 30 - also forth 0< previous abort" Real mode startup code is too big" + + also forth here over h# ff fill previous \ fill with FFs + ( #bytes-to-pad ) allot \ Pad out to ffff.fff0 + + \ ------->>>>> Main Entry Point + \ + \ ffff.fff0 - This is the hardwired address where the processor jumps + \ when it comes out of reset + + 16-bit + cli \ Turn off interrupts (does not affect NMI) + #) jmp \ Relative jump back to ffff.fc28 + h# ffffffff l, + h# ffffffff l, + h# ffffffff l, \ Good place to put a CRC +end-code + +end-assembling + +writing rmreset.img +rm-startup here over - ofd @ fputs +ofd @ fclose + +here rm-startup - constant /rm-startup +/rm-startup h# 400 <> abort" Real mode startup code is not the right size" + +\ LICENSE_BEGIN +\ Copyright (c) 2008 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/pc/linux.fth =================================================================== --- cpu/x86/pc/linux.fth 2008-12-24 21:16:22 UTC (rev 1049) +++ cpu/x86/pc/linux.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -135,6 +135,7 @@ \ If we are running in physical address mode, make a page directory \ that will map up when the kernel turns on paging. +[ifdef] fw-map-limit : v=p-pde ( adr -- ) dup h# 83 or cr3@ rot d# 22 rshift la+ l! ; @@ -145,6 +146,7 @@ fw-map-limit fw-map-base do i v=p-pde h# 40.0000 +loop cr4@ h# 10 or cr4! ; +[then] : linux-fixup ( -- ) [ifdef] linux-logo linux-logo [then] @@ -153,7 +155,7 @@ linux-base linux-params (init-program) linux-params to %esi - make-ofw-pdir + [ifdef] make-ofw-pdir make-ofw-pdir [then] linux-hook ; Added: cpu/x86/startmacros.fth =================================================================== --- cpu/x86/startmacros.fth (rev 0) +++ cpu/x86/startmacros.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,148 @@ +\ See license at end of file + +\ Some x86 assembler macros to make it easier to write x86 early +\ startup code. There are macros to set MSRs to specific values, +\ to set and clear individual MSR bits, to read and write PCI +\ configuration registers with the common CF8/CFC mechanism, +\ and to read and write I/O ports. + +\ The code keeps the MSR register number in %ecx, the low 32 bits +\ of the value in %eax, and the high 32 bits in %edx, consistent +\ with the way the rdmsr and wrmsr machine instructions work. + +\ The bitset and bitclr operations work on %eax, and the -hi versions +\ work on %edx. + +\ The I/O port operations also leave the data in %eax, so you can +\ use bitset and bitclr with them too. + +-1 value last-cx +also 386-assembler definitions + +\ If you do any direct manipulation of ECX in your startup code, +\ say "forget-msr" afterwards, so the MSR access macro will know +\ that ECX needs to be reloaded. + +: forget-msr -1 to last-cx ; + +\ set-cx is an internal implementation factor used by wmsr and rmsr. +\ It assembles code to put an MSR number in %ecx, optimizing out +\ unnecessary code by remembering what was last put there. + +: set-cx ( reg# -- ) + [ also forth ] + dup last-cx = if + drop + else + dup to last-cx + [ previous ] # cx mov [ also forth ] + then + [ previous ] +; + +\ Read/write an MSR to/from %edx,%eax +: rmsr ( reg# -- ) set-cx h# 0f c, h# 32 c, ; +: wmsr ( reg# -- ) set-cx h# 0f c, h# 30 c, ; + +\ These bit operations can be used between "rmsr" and "wmsr" + +\ Bit operations on the low 32-bit value in %eax +: bitset ( mask -- ) # ax or ; +: bitand ( mask -- ) # ax and ; +: bitclr ( mask -- ) invert bitand ; + +\ Bit operations on the high 32-bit value in %edx +: bitset-hi ( mask -- ) # dx or ; +: bitand-hi ( mask -- ) # dx and ; +: bitclr-hi ( mask -- ) invert bitand-hi ; + +\ Set an MSR to a verbatim 64-bit value +: set-msr ( d.val reg# -- ) -rot # dx mov # ax mov wmsr ; + +\ Set or clear bits in an MSR (read-modify-write the register) +: bitset-msr ( mask reg# -- ) tuck rmsr bitset wmsr ; +: bitclr-msr ( mask reg# -- ) tuck rmsr bitclr wmsr ; + +\ Some I/O port operations +\ These could be optimized to generate the immediate forms of in and out +\ for 8-bit port numbers, but it's not worth the trouble because we +\ access very few low-numbered ports. +: port-wb ( b port# -- ) swap # al mov # dx mov al dx out ; +: port-rb ( port# -- ) # dx mov dx al in ; +: port-ww ( w port# -- ) swap # ax mov # dx mov op: ax dx out ; +: port-rw ( port# -- ) ax ax xor # dx mov op: dx ax in ; +: port-wl ( l port# -- ) swap # ax mov # dx mov ax dx out ; +: port-rl ( port# -- ) # dx mov dx ax in ; + +[ifdef] no-port80 +: port80 ( byte -- ) drop ; +[else] +: port80 ( byte -- ) " # al mov al h# 80 # out" evaluate ; +[then] + +: config-setup ( config-adr -- ) + [ also forth ] + dup 3 invert and h# 8000.0000 or ( config-adr cf8-value ) + [ previous ] + # ax mov ( config-adr ) + h# cf8 # dx mov ( config-adr ) + ax dx out ( config-adr ) + [ also forth ] + 3 and h# cfc or ( data-port ) + [ previous ] + # dx mov +; +: config-wl ( l config-adr -- ) + config-setup ( l ) + # ax mov + ax dx out +; +: config-rl ( config-adr -- ) \ Returns value in EAX + config-setup + dx ax in +; +: config-ww ( w config-adr -- ) + config-setup ( w ) + op: # ax mov ( ) + op: ax dx out +; +: config-rw ( config-adr -- ) \ Returns value in AX + config-setup ( ) + ax ax xor + op: dx ax in +; +: config-rb ( config-adr -- ) \ Returns value in AL + config-setup ( ) + ax ax xor + dx al in +; + +: set-base ( adr -- ) # bx mov ; +: reg-save ( offset -- ) [bx] ax mov ax stos ; +: reg-restore ( offset -- ) ax lods ax swap [bx] mov ; + +previous definitions + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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: dev/isa/soundblaster.fth =================================================================== --- dev/isa/soundblaster.fth (rev 0) +++ dev/isa/soundblaster.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,378 @@ +purpose: SoundBlaster driver +copyright: Copyright 1997 FirmWorks All Rights Reserved + +hex + +headers +\needs +i : +i ( adr len n -- adr' len' ) encode-int encode+ ; +\needs encode-null : encode-null ( -- adr len ) 0 0 encode-bytes ; +\needs microseconds : microseconds ( n -- ) 0 do d# 4 0 do loop loop ; + +0 0 " i220" " /isa" begin-package + " sound" device-name + " sound" device-type + + h# 10 encode-int " #channels" property + + encode-null " built-in" property + + encode-null + d# 9 encode-int encode+ 1 encode-int encode+ \ Input (capture) + d# 15 encode-int encode+ 1 encode-int encode+ \ Output (playback) + " interrupts" property + + encode-null + \ Channel Type(2=F) DataBits CountBits BusMastering? + 0 +i 3 +i 8 +i d# 16 +i 0 +i \ First channel + 5 +i 3 +i 8 +i d# 16 +i 0 +i \ Second channel + " dma" property + + +true instance value use-dma? \ set at open +false instance value polled-mode? \ set at read/write/tone + +: dma-alloc ( n -- vaddr ) " dma-alloc" $call-parent ; +: dma-free ( vaddr n -- ) " dma-free" $call-parent ; + +1 value dma-channel# +: >chan ( offset -- port ) dma-channel# wa+ ; +: low-page ( -- port ) " "(87 83 81 82)" drop dma-channel# + c@ ; +: high-page ( -- port ) low-page h# 400 + ; +: dma-setup ( vadr len write-memory? -- vadr devaddr len ) + if 44 else 48 then dma-channel# + b pc! \ single transfer, increment addr, + \ no autoinit, ch 0 + \ Autoinit adds the 0x10 bit + + 2dup true " dma-map-in" $call-parent swap ( vadr devadr len ) + + \ Load count + 0 c pc! \ Reset address byte pointer + dup 1- wbsplit swap 1 >chan pc! 1 >chan pc! ( vadr devadr len ) + + \ Load address + 0 c pc! \ Reset address byte pointer + over lbsplit 2swap swap + 0 >chan pc! 0 >chan pc! ( vadr devadr len page-byte hi-byte ) + swap low-page pc! ( vadr devadr len hi-byte ) + high-page pc! ( vadr devadr len ) + + c0 d6 pc! \ Set cascade mode for channel 4 + 0 d4 pc! \ Release channel 4 (master for chs. 0-3) + + 0 dma-channel# + a pc! \ Release channel + +\ 10 8 pc! \ re-enable the chip +; +: dma-wait ( vaddr devaddr len -- timeout? ) + 1 dma-channel# << true swap + d# 400 0 do + dup 8 pc@ and if nip 0 swap leave then + d# 10 ms + loop + drop + >r + " dma-map-out" $call-parent + r> +; + +: mixer! ( byte regnum -- ) h# 224 pc! h# 225 pc! ; +: mixer@ ( regnum -- byte) h# 224 pc! h# 225 pc@ ; + +\ 82 is the IRQ status register +: irq-wait ( vaddr devaddr len bit -- timeout? ) + true swap ( vaddr devaddr len timeout? bit ) + d# 400 0 do ( vaddr devaddr len timeout? bit ) + dup 82 mixer@ and if nip 0 swap leave then + d# 10 ms ( vaddr devaddr len timeout? bit ) + loop ( vaddr devaddr len timeout? bit ) + drop ( vaddr devaddr len timeout? ) + >r + " dma-map-out" $call-parent + r> +; + +\ The SCR0 value "1c" enables the audio device at port 220, the joystick +\ at port 201, and establishes the port address of (but does not enable) +\ the FM synthesizer at port 388. +: enable ( -- ) +\ 0 h# fb pc! 0 h# e0 pc! h# 1c h# e1 pc! 0 h# f9 pc! + 3 h# 40 mixer! \ Enable the synthesizer and game ports +; + +: read1 ( -- byte ) begin h# 22e pc@ h# 80 and until h# 22a pc@ ; + +: wait-reset ( -- ) + get-msecs + begin ( old-ms ) + h# 22e pc@ h# 80 and if ( old-ms ) + h# 22a pc@ h# aa = if drop exit then ( old-ms ) + then ( old-ms ) + get-msecs over - 2 >= ( old-ms flag ) + until ( old-ms ) + drop +; + +: rddata@ ( -- b ) 22c pc@ ; +: cmd ( cmd -- ) begin rddata@ h# 80 and 0= until h# 22c pc! ; +: cmd1! ( data cmd -- data ) cmd cmd ; +: cmd1@ ( cmd -- data ) cmd read1 ; +: cmd2! ( data data cmd -- data ) cmd cmd cmd ; +: cmd2@ ( cmd -- data data ) cmd read1 read1 ; + +: put8 ( byte -- ) 10 cmd1! ; +: get8 ( -- byte ) 20 cmd1@ ; +\ : put16 ( word -- ) 11 cmd1! ; +\ : get16 ( -- word ) 21 cmd1@ ; + +: start-out8-normal ( length -- ) 1- wbsplit swap 14 cmd2! ; +\ : start-out16-normal ( length -- ) 1- wbsplit swap 15 cmd2! ; +: start-out8-auto ( length -- ) 1- wbsplit swap 1c cmd2! ; +\ : start-out16-auto ( length -- ) 1- wbsplit swap 1d cmd2! ; + +: start-out8-fast ( -- ) 90 cmd ; +: start-out16-fast ( -- ) 91 cmd ; +: halt-dma8 ( -- ) d0 cmd ; +\ d1 and d3 above +: continue-dma8 ( -- ) d4 cmd ; +: halt-dma16 ( -- ) d5 cmd ; +: continue-dma16 ( -- ) d6 cmd ; +: exit-dma16 ( -- ) d9 cmd ; +: exit-dma8 ( -- ) da cmd ; +\ e0 returns the bitwise inverse of its argument byte, for probing +\ e3 returns a copyright string +\ e4 writes a test register, e8 reads it back +\ f2 and f3 force an irq + +\ : start-in8-normal ( length -- ) 1- wbsplit swap 24 cmd2! ; +\ : start-in16-normal ( length -- ) 1- wbsplit swap 25 cmd2! ; +\ : start-in8-auto ( length -- ) 1- wbsplit swap 2c cmd2! ; +\ : start-in16-auto ( length -- ) 1- wbsplit swap 2d cmd2! ; + +: set-block-size ( n -- ) 1- wbsplit swap 48 cmd2! ; + +: set-time-constant ( b -- ) 40 cmd1! ; \ rate = 1,000,000 / (256 - n) +: set-freq ( w -- ) 1- wbsplit swap 41 cmd2! ; \ + +0 instance value sample-counts +0 instance value sample-rate + +: 1sample-time ( -- ) sample-counts 0 do loop ; +: sb-sample! ( byte -- ) put8 1sample-time ; +: sb-sample@ ( -- byte ) get8 1sample-time ; +: passthrough ( seconds -- ) + sample-rate * 0 do get8 put8 1sample-time loop +; + +: set-sample-rate ( hz -- ) + dup to sample-rate + ms-factor d# 1000 rot */ to sample-counts +; + +: 8kmono ( -- ) d# 131 set-time-constant h# 8000 set-sample-rate ; +: 8kstereo ( -- ) d# 16000 set-freq h# 8000 set-sample-rate ; +: 16kmono ( -- ) d# 16000 set-freq h# 16000 set-sample-rate ; +: 11kmono ( -- ) d# 165 set-time-constant h# 11025 set-sample-rate ; +: 11kstereo ( -- ) d# 11025 set-freq h# 11025 set-sample-rate ; +: 22kmono ( -- ) d# 22050 set-freq h# 22050 set-sample-rate ; + +: dac>mixer ( -- ) d# 100 ms h# d1 cmd ; +: undac>mixer ( -- ) d# 25 ms h# d3 cmd ; +: reset ( -- ) + enable + 1 h# 226 pc! + d# 300 ms 0 h# 226 pc! wait-reset dac>mixer +; + +[ifndef] rounded-/ +\ Integer division which rounds to nearest instead of truncating +: rounded-/ ( dividend divisor -- rounded-result ) + swap 2* swap / ( result*2 ) + dup 1 and + \ add 1 to the result if it is odd + 2/ ( rounded-result ) +; +[then] + +defer sample! ['] sb-sample! to sample! +defer sample@ ['] sb-sample@ to sample@ + +: dma-sample@ ( adr size -- actual ) +\ dup set-block-size + tuck ( size adr size ) + true dma-setup ( size vadr devadr len ) + \ use "2 irq-wait" for 16-bit DMA + 1 irq-wait if drop 0 then ( actual ) +; +: dma-sample! ( adr size -- actual ) +\ dup set-block-size + tuck ( size adr size ) + false dma-setup ( size vadr devadr len ) + dac>mixer ( size vadr devadr len ) + dup start-out8-normal ( size vadr devadr len ) + 1 irq-wait if drop 0 then ( actual ) + undac>mixer ( actual ) +; + +\ Mixer 80 is IRQ# +\ Mixer 81 is DMA hdma and dma +\ Mixer 82 is IRQ status + +: stereo ( -- ) 2 h# 0e mixer! ; +: mono ( -- ) 0 h# 0e mixer! ; + +: reset-mixer ( -- ) 0 0 mixer! ; + +: dac-volume ( l/r -- ) 14 mixer! ; +: mic-mix-volume ( l/r ) 1a mixer! ; +: record-mic ( -- ) 0 1c mixer! ; +: record-cd ( -- ) 2 1c mixer! ; +: record-line ( -- ) 6 1c mixer! ; +: record-mixer ( -- ) 7 1c mixer! ; + +: master-volume ( l/r -- ) 22 mixer! ; +: fm-volume ( l/r -- ) 26 mixer! ; +: auxa-volume ( l/r -- ) 28 mixer! ; +: auxb-volume ( l/r -- ) 2a mixer! ; +: pc-speaker-volume ( l/r -- ) 2c mixer! ; +\ : line-volume ( l/r -- ) 2e mixer! ; + +h# cc constant initial-gain + +external + +\ Determine chip type by looking for register bit differences +: init ( -- ) + enable + " SoundBlaster" + 2dup model ( $ ) + encode-string +\ " pnpPNP,b007" encode-string encode+ \ Windows Sound System compatible + " pnpPNP,b002" encode-string encode+ \ SoundBlaster Pro compatible + " pnpPNP,b000" encode-string encode+ \ SoundBlaster compatible + " compatible" property + + \ Probe for the FM synthesizer + + h# 220 my-space d# 16 encode-reg ( adr len ) \ Soundblaster + + \ If the synthesizer address port is writeable, add the synthesizer + \ register to the property value + + h# 5a 38a pc! 38a pc@ h# 5a = if + h# 388 my-space d# 4 encode-reg encode+ \ Synthesizer + then + " reg" property + + \ Put the synthesizer address port back to its default value, just in case + 1 h# 38a pc! +; + +: dma ( -- ) true to use-dma? ; +: pio ( -- ) false to use-dma? ; +: change-mode ( -- ) + my-args begin dup while \ Execute mode modifiers + ascii , left-parse-string ( rem$ first$ ) + my-self ['] $call-method catch if ( rem$ x x x ) + ." Unknown argument" cr + 3drop 2drop false exit + then ( rem$ ) + repeat ( rem$ ) + 2drop +; +: open ( -- flag? ) + change-mode + reset + initial-gain master-volume + true +; +: close ( -- ) 0 master-volume ; + +: read ( addr size -- actual ) + use-dma? if + false to polled-mode? + + dup dma-alloc over 2dup 2>r + dma-sample@ + nip 2r@ drop -rot dup >r move r> + 2r> dma-free + else + true to polled-mode? + + tuck bounds ?do sample@ i c! loop + then +; +: write ( adr size -- actual ) + use-dma? if + false to polled-mode? + + dup dma-alloc swap 2dup 2>r move + 2r@ dma-sample! + 2r> dma-free + else + true to polled-mode? + tuck bounds ?do i c@ sample! loop + then +; +decimal + +\ This table contains all 4 quadrants of the sine function, biased with the +\ zero point at d# 128, and beginning at -pi/2 radians (-90 degrees). This +\ is convenient for sampling. +create sine + 0 c, 3 c, 10 c, 22 c, 38 c, 57 c, 79 c, 104 c, + 128 c, 152 c, 177 c, 199 c, 218 c, 234 c, 246 c, 253 c, + 255 c, 253 c, 246 c, 234 c, 218 c, 199 c, 177 c, 152 c, + 128 c, 104 c, 79 c, 57 c, 38 c, 22 c, 10 c, 3 c, +hex + +0 value sample-buf +0 value /sample-buf + +\ Play a tone of the given frequency and duration +: tone ( hz msecs -- ) + 8kmono + + 8 * ( hz samples ) + dup to /sample-buf dup dma-alloc to sample-buf + + \ We divide the circle into 64K counts, increment the angle by "delta" + \ counts each sample, and pick the closest entry in the sine table. + \ Here we compute the delta angle from the frequency as: + \ delta (counts/sample) = + \ freq (cycles/sec) * 64K (counts/cycle) / 8000 (samples/sec) + + swap d# 16 lshift d# 8000 / swap ( delta samples ) + + true to polled-mode? ( delta samples ) + + 0 swap 0 do ( delta angle ) + \ Round to nearest sample ("400 +). For lower distortion, + \ we could increase the number of entries in the sine table + \ and/or interpolate between entries, but it hardly seems + \ worth the trouble for this application. + dup h# 400 + d# 11 rshift h# 1f and sine + c@ + + sample-buf i + c! + + \ Update angle, taking advantage of 2-complement arithmetic + \ to do the modulus for us. We don't worry about the carry + \ into the high bits here, because the "1f and" above will + \ throw them away for us. + over + ( delta angle' ) + loop ( delta angle' ) + 2drop ( ) + + sample-buf /sample-buf dma-sample! drop + sample-buf /sample-buf dma-free +; + +: ring-bell ( -- ) + open drop + d# 2000 d# 100 tone close +; +end-package + +also forth definitions +stand-init: Sound + " /isa/sound" " init" execute-device-method drop +; +previous definitions Added: dev/ne2000/ne2kpci.bth =================================================================== --- dev/ne2000/ne2kpci.bth (rev 0) +++ dev/ne2000/ne2kpci.bth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,17 @@ +\ See license at end of file +purpose: Main load file for driver + +command: &tokenize &this +build-now + +silent on + +begin-tokenizing ne2kpci.fc + +FCode-version2 + +fload ${BP}/dev/ne2000/ne2kpci.fth + +end0 + +end-tokenizing Added: dev/ne2000/ne2kpci.fth =================================================================== --- dev/ne2000/ne2kpci.fth (rev 0) +++ dev/ne2000/ne2kpci.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,660 @@ +purpose: PCI variant of NE2000 network controller +\ See license at end of file + +\ 0 0 " i300" " /isa" begin-package + +\ NE2000 controller board offsets + +" ethernet" device-name + +h# 10 constant dataport \ NE2000 Port Window. + +[ifdef] ISA +my-address my-space h# 20 reg +my-address value chip-base +: 1us ( -- ) h# 61 pc@ drop ; \ Touch timer port to pause +: reg! ( b offset -- ) chip-base + pc! 1us ; +: reg@ ( offset -- b ) chip-base + pc@ 1us ; +: data-out ( adr -- ) le-w@ dataport chip-base + pw! ; +: data-in ( adr -- ) dataport chip-base + pw@ swap le-w! ; +: map-regs ; : unmap-regs ; +[else] +h# 100 constant /regs + +\ Configuration space registers +my-address my-space encode-phys + 0 encode-int encode+ 0 encode-int encode+ + +\ I/O space registers +0 0 my-space 0100.0010 + encode-phys encode+ + 0 encode-int encode+ /regs encode-int encode+ + " reg" property + +0 instance value chip-base + +: my-w@ ( offset -- w ) my-space + " config-w@" $call-parent ; +: my-w! ( w offset -- ) my-space + " config-w!" $call-parent ; +: unmap-regs ( -- ) + 4 my-w@ 6 invert and 4 my-w! + chip-base /regs " map-out" $call-parent +; +: map-regs ( -- ) + 0 0 my-space h# 0100.0010 + /regs " map-in" $call-parent to chip-base + 4 my-w@ 5 or 4 my-w! +; +: reg! ( b offset -- ) chip-base + rb! ; +: reg@ ( offset -- b ) chip-base + rb@ ; +: data-out ( adr -- ) w@ dataport chip-base + rw! ; +: data-in ( adr -- ) dataport chip-base + rw@ swap w! ; + +[then] + +" network" device-type + +headerless + +[ifdef] 386-assembler +[ifndef] pseudo-dma-in +fload ${BP}/cpu/i386/inoutstr.fth +[then] +[then] + +\ The EN registers - the DS8390 chip registers +\ There are two (really 3) pages of registers in the chip. You select +\ which page you want, then address them at offsets 00-0F from base. +\ The chip command register (CCMD; offset 0) appears in both pages. + +\ Page 1 + +h# 001 constant PHYS \ This board's physical enet addr RD WR +h# 007 constant CURPAG \ Current memory page RD WR +h# 008 constant MULT \ Multicast filter mask array (8 bytes) RD WR + +\ Chip commands in command register +h# 001 constant STOP \ Stop the chip +h# 002 constant START \ Start the chip +h# 004 constant TRANS \ Transmit a frame +h# 008 constant RREAD \ remote read +h# 010 constant RWRITE \ remote write +h# 020 constant NODMA \ No remote DMA used on this card +h# 000 constant PAGE0 \ Select page 0 of chip registers +h# 040 constant PAGE1 \ Select page 1 of chip registers + +\ Commands for RXCR - RX control reg +h# 001 constant RCRC \ Save error pkts +h# 002 constant RUNT \ Accept runt pkt +h# 004 constant BCST \ Accept broadcasts +h# 008 constant MULTI \ Multicast (if pass filter) +h# 010 constant PROMP \ Promiscuous physical addresses +h# 020 constant MON \ Monitor mode (no packets rcvd) + +\ Bits in TXCR - transmit control reg +h# 001 constant TCRC \ inhibit CRC, do not append crc +h# 002 constant LOOPB \ Set loopback mode +h# 006 constant LB01 \ encoded loopback control +h# 008 constant ATD \ auto tx disable +h# 010 constant OFST \ collision offset enable + +\ Bits in DCFG - Data config register +h# 001 constant WTS \ word transfer mode selection +\ h# 002 constant BOS \ byte order selection +\ h# 004 constant LAS \ long addr selection +\ h# 008 constant BMS \ burst mode selection +\ h# 010 constant ARM \ autoinitialize remote +\ h# 000 constant FT00 \ burst length selection +\ h# 020 constant FT01 \ burst length selection +\ h# 040 constant FT10 \ burst length selection +\ h# 060 constant FT11 \ burst length selection + +\ Bits in ISR - Interrupt status register +h# 001 constant RX \ Receiver, no error +h# 002 constant TX \ Transmitter, no error +h# 004 constant RX-ERR \ Receiver, with error +h# 008 constant TX-ERR \ Transmitter, with error +h# 010 constant OVR \ Receiver overwrote the ring +h# 020 constant COUNTERS \ Counters need emptying +h# 040 constant RDC \ remote dma complete +h# 080 constant RESET \ Reset completed + +h# 03f constant ALL \ Interrupts we will enable + +\ Bits in received packet status byte and RSR +h# 001 constant RXOK \ Received a good packet +h# 002 constant CRCE \ CRC error +h# 004 constant FAE \ frame alignment error +h# 008 constant FO \ FIFO overrun +h# 010 constant MPA \ missed pkt +h# 020 constant PHY \ physical/multicase address +h# 040 constant DIS \ receiver disable. set in monitor mode +h# 080 constant DEF \ deferring + +\ Bits in TSR - TX status reg + +h# 001 constant PTX \ Packet transmitted without error +h# 002 constant DFR \ non deferred tx +h# 004 constant COLL \ Collided at least once +h# 008 constant COLL16 \ Collided 16 times and was dropped +h# 010 constant CRS \ carrier sense lost +h# 020 constant FU \ TX FIFO Underrun +h# 040 constant CDH \ collision detect heartbeat +h# 080 constant OWC \ out of window collision + +\ Description of header of each packet in receive area of memory + +h# 0 constant STAT \ Received frame status +h# 1 constant NXT-PG \ Page after this frame +h# 2 constant SIZE-LO \ Length of this frame +h# 3 constant SIZE-HI \ Length of this frame +h# 4 constant NHDR \ Length of above header area + + +\ Shared memory management parameters + +h# 040 constant TSTART-PG \ First page of TX buffer +h# 046 constant RSTART-PG \ Starting page of RX ring +h# 080 constant RSTOP-PG \ Last page +1 of RX ring + +: longpause ( -- ) 2 ms ; \ Should be 1.6 ms + +0 instance value #crc-errors +0 instance value #alignment-errors +0 instance value #missed + +\ Page 0 registers +: cmd! ( b -- ) 0 reg! ; +: stat@ ( -- b ) 0 reg@ ; +: startpg! ( page# -- ) 1 reg! ; \ Starting page of ring buffer +: stoppg! ( page# -- ) 2 reg! ; \ Ending page + 1 of ring buffer +: clda@ ( -- adr ) 1 reg@ 2 reg@ bwjoin ; \ Current local DMA address +: boundary@ ( -- page# ) 3 reg@ ; \ Boundary page of ring bfr +: boundary! ( page# -- ) 3 reg! ; +: tsr@ ( -- bits ) 4 reg@ ; \ Transmit status reg +: tpsr! ( page# -- ) 4 reg! ; \ Transmit starting page +: ncr@ ( -- count ) 5 reg@ ; \ Number of collision reg +: fifo@ ( -- data ) 6 reg@ ; \ FIFO data +: rcnt! ( cnt -- ) wbsplit swap h# 0a reg! h# 0b reg! ; +: tcnt! ( cnt -- ) wbsplit swap 5 reg! 6 reg! ; +: isr@ ( -- mask ) 7 reg@ ; \ Interrupt status reg +: isr! ( mask -- ) 7 reg! ; +: rsr@ ( -- mask ) h# c reg@ ; \ Receive status reg +: imr! ( mask -- ) h# f reg! ; \ Interrupt mask reg +: rxcr! ( bits -- ) h# c reg! ; \ Receive control reg +: txcr! ( bits -- ) h# d reg! ; \ Transmit control reg +: dcfg! ( bits -- ) h# e reg! ; \ Data configuration reg +: counter0@ ( -- count ) h# d reg@ ; \ Rcv alignment error counter +: counter1@ ( -- count ) h# e reg@ ; \ Rcv CRC error counter +: counter2@ ( -- count ) h# f reg@ ; \ Rcv missed frame error counter +: rda! ( page# -- ) wbsplit swap 8 reg! 9 reg! ; +: crda@ ( -- adr ) 8 reg@ 9 reg@ bwjoin ; \ Current remote DMA address + +: set-page ( page# -- old-cmd-reg ) 6 lshift stat@ tuck or cmd! ; +: preg@ ( reg# page# -- b ) set-page >r reg@ r> cmd! ; +: preg! ( b reg# page# -- ) set-page >r reg! r> cmd! ; + +: curpag@ ( -- page# ) 7 1 preg@ ; +: curpag! ( page# -- ) 7 1 preg! ; + +: stop-chip ( -- ) NODMA STOP or cmd! ; +: reset-8390 ( -- ) + h# 1f reg@ longpause h# 1f reg! \ should set command 21, 80 +; + +0 value endcfg + +\ Block input routine + +: block-input ( adr len offset -- ) + NODMA START or cmd! + rda! dup rcnt! ( adr len ) + RREAD START or cmd! \ read and start + +\ [ endcfg WTS and ] [if] + ( buf len ) +[ifdef] pseudo-dma-in + dataport chip-base + pseudo-dma-in +[else] + 2dup 1 invert and bounds ?do ( adr len ) + i data-in ( adr len ) + /w +loop ( adr len ) + dup 1 and if ( adr len ) + + 1- dataport reg@ swap c! + else + 2drop + then +[then] +\ [else] +\ bounds ?do dataport reg@ i c! loop +\ [then] +; + +: block-output ( adr len offset -- error? ) + NODMA START or cmd! \ stop & clear the chip + rda! dup 1 and + dup rcnt! ( adr len ) + RWRITE START or cmd! \ write and start + ( buf len ) +[ifdef] pseudo-dma-out + dataport chip-base + pseudo-dma-out +[else] + bounds ?do i data-out /w +loop +[then] + + h# 10000 0 do + isr@ RDC and if unloop false exit then + loop + true +; + +RSTOP-PG value sm-rstop-ptr + +[ifdef] board-features +0 value is-overrun-690 +[then] + +\ a temp buffer for the received header +d# 4 constant RCV-HDR-SIZE +RCV-HDR-SIZE buffer: rcv-hdr + +0 instance value #rx-errors +0 instance value #rx-overruns +0 instance value #tx-errors + +\ Next Packet Pointer +\ +\ Initialize to the same value as the current page pointer (start page 1). +\ Update after each reception to be the value of the next packet pointer +\ read from the NIC Header. +\ Copy value -1 to boundry register after each update. +\ Compare value with contents of current page pointer to verify that a +\ packet has been received (don't trust ISR RXE/PRX bits). If !=, one +\ or more packets have been received. + +0 value next-page +0 value last-curpag + +\ Added flags and temp storage for new receive overrun processing + +: tx-wait ( -- ) + d# 1024 7 * 0 do \ max coll time in Ethernet slot units + d# 51 0 do \ Wait 1 time slot, assuming 1 usec I/O + stat@ TRANS and 0= if \ transmitter still running? + unloop unloop exit + then + loop + loop + #tx-errors 1+ to #tx-errors \ count hard errors. +; + +[ifdef] interrupt-driven +: tx-ack ( -- ) + tsr@ drop \ get state from prior TX + + \ Acknowledge the TX interrupt + TX TX-ERR or isr! \ clr either possible TX int bit +; +[then] + +headers +: write ( adr len -- actual ) + stat@ TRANS and if + tx-wait +[ifdef] interrupt-driven + tx-ack + else + \ Check for recent TX completions in the interrupt status register + isr@ TX TX-ERR and if + tx-ack + then +[then] + then + + d# 1514 min tuck ( len adr len' ) + d# 60 max ( len adr len' ) + + RDC isr! \ clear remote interrupt int. + + dup tcnt! ( len adr len' ) + TSTART-PG 8 lshift block-output ( len error? ) + if drop -1 exit then ( len ) + + TSTART-PG tpsr! \ Transmit Page Start Register + TRANS NODMA or START or cmd! \ Start the transmitter +; +headerless + +: set-address ( adr len -- ) + 0 do dup i + c@ PHYS i + 1 preg! loop drop +; + +false value promiscuous? +false value loopback? +false value dma? +BCST value rx-mode + +\ Set the multicast filter mask bits for promiscuous reception +: set-multicast ( -- ) + NODMA PAGE1 or STOP or cmd! \ Select page 1 + 8 0 do h# ff MULT i + reg! loop + NODMA START or cmd! \ Select page 0 +; + +: set-rx-mode ( -- ) \ Set receiver to selected mode + BCST promiscuous? if MULTI or PROMP or then rxcr! +; +: set-tx-mode ( -- ) loopback? if LOOPB else 0 then txcr! ; + +: reset-board ( -- ) + reset-8390 + stop-chip + + \ Wait 1.6ms for the NIC to stop transmitting or receiving a packet. + \ National says monitoring the ISR RST bit is not reliable, so a wait + \ of the maximum packet time (1.2ms) plus some padding is required. + + longpause +; + +: reset-interface ( -- ) + reset-board + h# ff isr! \ Clear all pending interrupts + 0 imr! \ Turn off all interrupt enables +; +: rx-error ( -- ) + #rx-errors 1+ to #rx-errors + + \ Error recovery: + \ Copy the last known current page pointer into the next packet pointer + \ which will result in skipping all the packets from the errored one to + \ where the NIC was storing them when we entered this ISR, but prevents + \ us from trying to follow totally bogus next packet pointers through + \ the card RAM space. + + last-curpag to next-page +; + +: +boundary ( -- ) + next-page 1- dup RSTART-PG < if drop sm-rstop-ptr 1- then + boundary! +; + +: next-buffer ( -- page# ) rcv-hdr NXT-PG + c@ ; +[ifndef] le-w@ : le-w@ ( adr -- w ) dup c@ swap 1+ c@ bwjoin ; [then] +: packet-ok? ( -- len true | false ) + rcv-hdr RCV-HDR-SIZE next-page 8 lshift block-input ( ) + rcv-hdr STAT + c@ RXOK and if ( ) + next-buffer RSTART-PG sm-rstop-ptr within if + rcv-hdr SIZE-LO + le-w@ NHDR - ( len ) + true ( len true ) + exit + then + then + \ Bad packet or chip screwup + rx-error +boundary false ( false ) +; + +\ Do the work of copying out a receive frame. +: do-receive ( adr len -- len ) + tuck next-page 8 << NHDR + block-input ( len ) + next-buffer to next-page ( len ) + +boundary ( len ) +; + +fload ${BP}/dev/ne2000/queue.fth + +: pull-packets ( -- ) + begin last-curpag next-page <> while ( ) + packet-ok? if ( length ) + new-buffer ( handle adr len ) + do-receive drop ( handle ) + enque-buffer ( ) + then ( ) + repeat ( ) +; + +0 value rcv-ovr-resend \ flag to indicate resend needed +: overrun ( mask -- ) + drop +[ifdef] board-features + board-features BF-NIC-690 and if + 1 to is-overrun-690 + exit + then +[then] + + #rx-overruns 1+ to #rx-overruns + + \ Get the command register TXP bit to test for incomplete transmission later + + stat@ ( status ) + + stop-chip + + \ Wait for the NIC to stop transmitting or receiving a packet. + longpause + + \ Clear the remote byte count registers + 0 rcnt! + + \ check the saved state of the TXP bit in the command register + 0 to rcv-ovr-resend \ clear the resend flag + ( status ) TRANS and if \ Was transmitter still running? + \ Transmitter was running, see if it finished or died + isr@ TX TX-ERR or 0= if + \ Transmitter did not complete, remember to resend the packet later. + true to rcv-ovr-resend + then + then + + \ Put the NIC chip into loopback so it won't keep trying to + \ receive into a full ring + + LOOPB txcr! \ Put transmitter in loopback mode + START NODMA or cmd! \ Start the chip running again + + \ Verify that there is really a packet to receive by fetching the current + \ page pointer and comparing it to the next packet pointer. + + curpag@ curpag! \ Rewrite current page to fix SMC bug. + + pull-packets + + +boundary + + \ When we get here we have either removed one packet from the ring and + \ updated the boundary register, or determined that there really were + \ no new packets in the ring. + + OVER isr! \ Clear the overrun interrupt bit + set-tx-mode \ Take the NIC out of loopback + + \ Resend any incomplete transmission + rcv-ovr-resend if + TRANS NODMA or START or cmd! \ Start the transmitter + then +; + +[ifdef] board-features +: recv-690-overrun ( -- ) + false to is-overrun-690 + boundary@ boundary! \ rewrite bndry with itself + OVER isr! \ Clear overrun interrupt bit +; +[then] + +: empty-counters ( -- ) + \ We have to read the counters to clear them and to clear the interrupt. + counter0@ #alignment-errors + to #alignment-errors + counter1@ #crc-errors + to #crc-errors + counter2@ #missed + to #missed +; +: .errors ( -- ) + isr@ + dup RX-ERR and if ." RX-ERR " then + dup TX-ERR and if ." TX-ERR " then + dup OVR and if ." OVR " dup overrun then + dup COUNTERS and if ." COUNTERS " empty-counters then + isr! +; + +headers +: read ( adr len -- -2 | actual ) + curpag@ to last-curpag ( adr len ) + + .errors ( adr len ) + + ?return-queued 0= if ( adr len ) + last-curpag next-page <> if ( adr len ) + packet-ok? if ( adr len actual ) + min do-receive ( actual | -1 ) \ Good packet + else ( adr len ) + 2drop -1 ( -1 ) \ Bad packet + then ( actual | -1 ) + else ( adr len ) + 2drop -2 ( -2 ) \ No packet + then ( actual | -2 ) + then ( actual | -2 ) + + pull-packets +; + +headerless +h# 10 buffer: board-data +h# 6 buffer: rom-address +: init-card ( -- okay? ) + \ Put the board data, which is 16 bytes starting at remote + \ dma address 0, into a buffer called board-data. + +\ [ base c@ base @ <> ] [if] + endcfg WTS or to endcfg +\ [then] + endcfg dcfg! + + NODMA PAGE0 or START or cmd! + + 0 rda! h# 20 rcnt! \ address is 0, byte count is 0x10*2 + RREAD START or cmd! \ read and start + + board-data h# 10 bounds do dataport reg@ i c! loop + + board-data rom-address 6 move + rom-address 6 encode-bytes " local-mac-address" property + true +; + +[ifndef] $= +: $= ( $1 $2 -- equal? ) + rot tuck <> if 3drop false exit then ( adr1 adr2 len1 ) + comp 0= +; +[then] + +0 value tftp-args +0 value tftp-len +: parse-args ( -- ) + my-args begin ( rem$ ) + 2dup to tftp-len to tftp-args ( rem$ ) + dup while ( rem$ ) + ascii , left-parse-string ( rem$ head$ ) + 2dup " promiscuous" $= if true to promiscuous? else ( rem$ head$ ) + 2dup " loopback" $= if true to loopback? else ( rem$ head$ ) + 2dup " pio" $= if false to dma? else ( rem$ head$ ) + 2dup " dma" $= if true to dma? else ( rem$ head$ ) + 2drop 2drop exit ( ) + then then then then ( rem$ head$ ) + 2drop ( rem$ ) + repeat ( rem$ ) + 2drop ( ) +; + +headers +\ Called once to initialize the card +: open ( -- ) + map-regs + parse-args + + \ Set burst mode, 8 deep FIFO, maybe big-endian + h# 48 base c@ base @ <> if 2 or then to endcfg + + reset-board \ Reset and stop the 8390. + endcfg dcfg! \ Init the Data Config Reg. + stop-chip \ Stop chip and select page 0 + 0 rcnt! \ Clear Remote Byte Count Regs. + MON rxcr! \ Set receiver to monitor mode + LOOPB txcr! \ Put NIC in Loopback Mode 1. + + \ Do anything special that the card needs. + \ Read the Ethernet address into rom-address. + init-card 0= if false exit then + + endcfg dcfg! \ Re-init endcfg in case they + \ put it into word mode. + + \ Init STARTPG to same value as BOUNDARY + RSTART-PG dup startpg! boundary! + sm-rstop-ptr stoppg! + + h# ff isr! \ Clear pending interrupts. + +\ ALL imr! \ Init IMR + 0 imr! \ Init IMR + + \ Init the Ethernet address and multicast filters. + mac-address set-address \ Now set the address in the 8390 chip + set-multicast \ Set the multicast masks + + \ Program the Current Page Register to Boundary Pointer + 1 + RSTART-PG 1+ dup curpag! + dup to last-curpag to next-page + + set-rx-mode + set-tx-mode + + NODMA START or cmd! \ Start chip + + init-queue + + true +; +: close ( -- ) + NODMA STOP or cmd! \ Start chip + drain-queue + unmap-regs +; + +: load ( adr -- len ) + " obp-tftp" find-package if ( adr phandle ) + my-args rot open-package ( adr ihandle|0 ) + else ( adr ) + 0 ( adr 0 ) + then ( adr ihandle|0 ) + + dup 0= if ." Can't open obp-tftp support package" abort then + ( adr ihandle ) + + >r + " load" r@ $call-method ( len ) + r> close-package +; + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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: dev/video/build/video.bth =================================================================== --- dev/video/build/video.bth (rev 0) +++ dev/video/build/video.bth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,12 @@ +purpose: Load file for Video "super driver" + +command: &tokenize &this +build-now + +silent on + +begin-tokenizing video.fc + +fload ${BP}/dev/video/build/loadfcod.fth + +end-tokenizing Added: dev/video/cirrus.bth =================================================================== --- dev/video/cirrus.bth (rev 0) +++ dev/video/cirrus.bth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,42 @@ +\ See license at end of file +purpose: Main load file for driver + +command: &tokenize &this +build-now + +silent on + +begin-tokenizing cirrus.fc + +FCode-version2 + +fload ${BP}/dev/video/loadcirrus.fth +probe + +end0 + +end-tokenizing + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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: dev/video/common/pci.fth =================================================================== --- dev/video/common/pci.fth 2008-12-24 21:16:22 UTC (rev 1049) +++ dev/video/common/pci.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -69,6 +69,7 @@ 0 instance value fb-base-reg : munge-map-size ( raw -- new ) \ Makes a proper map-size argument + dup 0= if exit then 1 to mask-val \ Basically, just walk a one up mask-val value, begin \ anding all the way looking for first non-zero @@ -128,7 +129,7 @@ use-cirrus-words \ Cirrus stuff is inside S3 code " CL54xx" add-arc-ident dup case \ Look for known ID values. - b8 of gd5434 endof + b8 of gd5434 endof \ Actually gd5446, but gd5434 is close enough a8 of gd5434 endof a0 of gd5430 endof ac of gd5436 endof @@ -220,23 +221,26 @@ 0 encode-int encode+ r> encode-int encode+ ; -false instance value needs-rom +: add-rom-regs ( -- ) + \ If this driver is used for an on board frame buffer, the builtin.fth + \ file for that platform should declare a "no-rom" property in the node + \ where this driver is used. This will prevent the reg property from + \ including an entry for a non-existent ROM + " no-rom" get-my-property 0= if + 2drop exit + then + + h# 30 get-map-size if + 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM + then +; + : encode-reg-property ( -- ) - " no-rom" get-my-property 0= if \ If this driver is used for an on - false to needs-rom 2drop \ board frame buffer, the builtin.fth - else \ file for that platform should declare - true to needs-rom \ a "no-rom" property in the node - then \ where this driver is used. This will - \ prevent the reg property from - \ including an entry for a non-existent - \ ROM cirrus? if 0 0m h# 200.0010 0 h# 10 get-map-size h# 10 >reg-props \ Frame buffer - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs legacy-regs then @@ -244,9 +248,7 @@ s3-928? s3-964? or s3-864? or s3-868? or if h# 000.0000 0m 200.0010 0 h# 100.0000 10 >reg-props \ Frame buffer - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs legacy-regs h# 102 0m a100.0000 0 1 0 >reg-props \ Non-relocatable regs s3-common-regs @@ -258,9 +260,7 @@ h# 100.0000 0m 200.0010 0 h# 1.80a0 10 >reg-props \ LE MMIO regs h# 300.0000 0m 200.0010 0 h# 1.80a0 10 >reg-props \ BE MMIO regs - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs legacy-regs h# 102 0m a100.0000 0 1 0 >reg-props \ Non-relocatable regs @@ -282,9 +282,7 @@ h# 100.0000 0m 200.0010 0 h# 1.80a0 10 >reg-props \ LE MMIO regs h# 300.0000 0m 200.0010 0 h# 1.80a0 10 >reg-props \ BE MMIO regs - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs h# a8000 0m a200.0000 0 6900 0 >reg-props \ MMIO regs legacy-regs @@ -302,26 +300,20 @@ 0 0m h# 200.001c 0 h# 14 get-map-size h# 1c >reg-props \ Can't actually probe 20, set = 18 0 0m h# 200.0020 0 h# 18 get-map-size h# 20 >reg-props - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs then mga? if 0 0m h# 200.0014 0 h# 14 get-map-size h# 14 >reg-props \ Frame Buffer 0 0m h# 200.0010 0 h# 10 get-map-size h# 10 >reg-props \ IO - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs legacy-regs then weitek? if 0 0m h# 200.0010 0 h# 10 get-map-size h# 10 >reg-props \ Memory - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs legacy-regs h# 102 0m a100.0000 0 1 0 >reg-props \ Unique non-relocateable IO s3-common-regs @@ -334,16 +326,12 @@ 0 0m h# 200.001c 0 h# 1c get-map-size h# 1c >reg-props \ Base 3 0 0m h# 200.0020 0 h# 20 get-map-size h# 20 >reg-props \ Base 4 0 0m h# 100.0024 0 h# 24 get-map-size h# 24 >reg-props \ Base 5 - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs then ct? if 0 0m h# 200.0010 0 h# 10 get-map-size h# 10 >reg-props \ Frame buffer - needs-rom if - 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM - then + add-rom-regs legacy-regs then @@ -373,7 +361,6 @@ " reg" property reg-props /reg-props free-mem \ Release the tempory buffer - ; encode-reg-property \ Build the reg property now Modified: dev/video/controlr/cirrus.fth =================================================================== --- dev/video/controlr/cirrus.fth 2008-12-24 21:16:22 UTC (rev 1049) +++ dev/video/controlr/cirrus.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -58,13 +58,14 @@ : use-cirrus-words ( -- ) \ Turns on the Cirrus-specific words ['] init-cirrus-controller to init-controller ['] cirrus-textmode to ext-textmode - use-vga-dac + use-vga ; : probe-dac ( -- ) \ Chained probing word...sets the dac type - cirrus? if use-cirrus-dac exit then + cirrus? if use-cirrus-dac exit then probe-dac \ Try someone else's probe ; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Added: dev/video/controlr/cirruspci.fth =================================================================== --- dev/video/controlr/cirruspci.fth (rev 0) +++ dev/video/controlr/cirruspci.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,198 @@ +\ See license at end of file +purpose: PCI Methods + +\ PCI access code. +\ This code is used to determine which controller is present and +\ to begin the process of sorting out which specific words are to +\ be plugged into the various defered words. Also, and just as important, +\ the REG property gets formed here. + +hex +headers + +struct + 04 field >physlo \ phys.lo address + 04 field >physmid \ phys.mid address + 04 field >physhi \ phys.hi address + 04 field >hiflag \ phis.hi modifiers (n/p/t... bits) + 04 field >size1 \ First size + 04 field >size2 \ Second size + 04 field >reg# \ PCI Base address register offset (10,14,18...) +constant /array + +0 instance value reg-props \ Pointer for temp storage +0 instance value tpoint \ A second pointer +d# 50 /array * instance value /reg-props \ Allocate 50 entries for now + +/reg-props alloc-mem to reg-props \ Allocate some memory +reg-props /reg-props erase \ Clean it up + +: >reg-props ( phys.[lo,mid,hi] hi.flag size size -- ) + + reg-props /array - to tpoint + begin + tpoint /array + to tpoint + tpoint >physhi l@ 0= + until \ tpoint now points to first empty slot + + ( phys.[lo,mid,hi] hi.flag size size reg# ) + tpoint >reg# l! ( phys.[lo,mid,hi] hi.flag size size ) + tpoint >size2 l! ( phys.[lo,mid,hi] hi.flag size ) + tpoint >size1 l! ( phys.[lo,mid,hi] hi.flag ) + tpoint >hiflag l! ( phys.[lo,mid,hi] ) + tpoint >physhi l! ( phys.lo phys.mid ) + tpoint >physmid l! ( phys.lo ) + tpoint >physlo l! ( ) +; + +: 0m ( -- 0 my-space ) 0 my-space ; + +: legacy-regs ( -- ) + h# 3b0 0m h# a100.0000 0 h# C 0 >reg-props + h# 3c0 0m h# a100.0000 0 h# 20 0 >reg-props + h# a.0000 0m h# a200.0000 0 h# 2.0000 0 >reg-props +; + +0 instance value mask-val + +: munge-map-size ( raw -- new ) \ Makes a proper map-size argument + dup 0= if exit then + + 1 to mask-val \ Basically, just walk a one up mask-val value, + begin \ anding all the way looking for first non-zero + mask-val 2 * to mask-val \ bit. If chip is working correctly, first non + dup mask-val and 0 <> \ zero bit location tells you how big a + until \ map-size you need. + drop + mask-val +; + +: get-map-size ( reg# -- map-size ) \ Returns the amount of memory required + >r r@ c-l@ ( old-val ) \ Get old value + -1 r@ c-l! ( old-val ) \ Write all ones + r@ c-l@ ( old-val raw ) \ Read back + ff invert and ( old-val raw ) \ Mask off low bits + swap r> c-l! ( raw ) \ Put old value back + munge-map-size ( map-size ) \ Mask off high bits +; + +: add-arc-ident ( adr len -- ) + encode-string " arc-identifier" property +; + +: determine-controller ( -- ) \ Determines which PCI controller we have + 0 c-w@ ( id ) \ PCI ID now on stack + + case ( id ) \ First we figure out which chip set... + h# 1013 of cirrus to chip endof + endcase ( ) + + 2 c-w@ ff and ( version ) + + cirrus? if \ Cirrus based, sort out various controllers + use-cirrus-words \ Cirrus stuff is inside S3 code + " CL54xx" add-arc-ident + dup case \ Look for known ID values. + b8 of gd5434 endof \ Actually gd5446, but gd5434 is close enough + a8 of gd5434 endof + a0 of gd5430 endof + ac of gd5436 endof + ( default ) -1 swap \ Well, maybe we can't program it... + endcase + to variant + then ( version ) + + drop ( ) + + variant -1 <> to safe? \ If varient is <> -1, then we know what it is. +; + +headers + +: reg-entry ( map reg size -- ) + >r >r >r + 0 0 my-space + r> r> + + + encode-phys encode+ + 0 encode-int encode+ r> encode-int encode+ +; + +: add-rom-regs ( -- ) + \ If this driver is used for an on board frame buffer, the builtin.fth + \ file for that platform should declare a "no-rom" property in the node + \ where this driver is used. This will prevent the reg property from + \ including an entry for a non-existent ROM + + " no-rom" get-my-property 0= if + 2drop exit + then + + h# 30 get-map-size if + 0 0m h# 200.0030 0 h# 30 get-map-size h# 30 >reg-props \ ROM + then +; + +: encode-reg-property ( -- ) + + cirrus? if + 0 0m h# 200.0010 0 h# 10 get-map-size h# 10 >reg-props \ Frame buffer + add-rom-regs + legacy-regs + then + + \ Now we build reg entry up + + my-address my-space encode-phys 0 encode-int encode+ 0 encode-int encode+ + + reg-props to tpoint + begin + tpoint >physhi l@ 0<> if + tpoint >physlo l@ ( phys.lo ) + tpoint >physmid l@ ( phys.lo phys.mid ) + tpoint >physhi l@ ( phys.lo phys.mid phys.hi ) + tpoint >hiflag l@ or ( phys.lo phys.mid phys.hi ) + encode-phys encode+ + tpoint >size1 l@ ( size ) + encode-int encode+ + tpoint >size2 l@ ( size ) + encode-int encode+ + tpoint /array + to tpoint + false + else + true + then + until + + " reg" property + + reg-props /reg-props free-mem \ Release the tempory buffer +; + +: probe + determine-controller + encode-reg-property \ Build the reg property now +; + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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: dev/video/controlr/vga.fth =================================================================== --- dev/video/controlr/vga.fth 2008-12-24 21:16:22 UTC (rev 1049) +++ dev/video/controlr/vga.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -120,7 +120,7 @@ : crtc@ ( index -- value ) crtcbuf + c@ ; : .vga-mode ( -- ) - push-decimal + base @ >r decimal ." HTotal: " 0 crtc@ 4 u.r cr ." HDispEnd: " 1 crtc@ 4 u.r cr ." HBlankStart: " 2 crtc@ 4 u.r cr @@ -154,7 +154,7 @@ ." SelectRowScn:" h# 17 crtc@ 1 rshift 1 and 4 u.r cr ." SelectA13: " h# 17 crtc@ 1 and 4 u.r cr ." LineCompare: " h# 18 crtc@ 4 u.r cr - pop-base + r> base ! ; : showmode ( adr len -- ) crtcbuf swap move .vga-mode ; @@ -189,6 +189,22 @@ ['] vga-video-on to video-on ; +: basic-vga-init ( -- ) + vga-reset + seq-regs + attr-regs + grf-regs + + crt-regs + 4 feature-ctl! \ Vertical sync ctl + hsync-on +; +: basic-vga ( -- ) + ['] (vga-crt-table) to crt-table + ['] basic-vga-init to init-controller + ['] noop is init-dac +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Added: dev/video/loadcirrus.fth =================================================================== --- dev/video/loadcirrus.fth (rev 0) +++ dev/video/loadcirrus.fth 2008-12-28 03:58:44 UTC (rev 1050) @@ -0,0 +1,13 @@ +purpose: Interior load file for Cirrus video driver + +" vga" device-name + +fload ${BP}/dev/video/common/defer.fth \ Defered words +fload ${BP}/dev/video/controlr/pcimap.fth \ Generic PCI implementations +fload ${BP}/dev/video/dacs/cirrus.fth +fload ${BP}/dev/video/controlr/vga.fth \ Load generic VGA routines +fload ${BP}/dev/video/controlr/cirrus.fth \ Load Cirrus routines +fload ${BP}/dev/video/controlr/cirruspci.fth \ PCI routines +fload ${BP}/dev/video/common/graphics.fth \ Graphics and color routines +fload ${BP}/dev/video/common/init.fth \ Init code +fload ${BP}/dev/video/common/display.fth \ High level interface code

1 0

r1049 - cpu/x86/pc/olpc
by svn＠openfirmware.info Dec. 24, 2008

Dec. 24, 2008

Author: wmb Date: 2008-12-24 22:16:22 +0100 (Wed, 24 Dec 2008) New Revision: 1049 Modified: cpu/x86/pc/olpc/addrs.fth cpu/x86/pc/olpc/resume.bth cpu/x86/pc/olpc/suspend.fth Log: OLPC suspend/resume: a) Fixed a problem in the SD register restore code b) Added "forget-msr" directives after ecx modifications to ensure that the correct MSR is read thereafter. c) Fixed the "save-display" portion of the suspend/resume code (which is commented-out by default) which had stopped working some time ago. The main fix was to change the value of the address constant "resume-data" to prevent it overwriting the save/restore code, which is longer when save-display is defined. This was done while investigating how to eliminate display glitches. d) Added code to save/restore the state of graphics processor registers (part of the commented-out "save-display" code). e) Added a "kb-suspend" test for testing suspend-between-keystrokes. Modified: cpu/x86/pc/olpc/addrs.fth =================================================================== --- cpu/x86/pc/olpc/addrs.fth 2008-12-24 21:05:15 UTC (rev 1048) +++ cpu/x86/pc/olpc/addrs.fth 2008-12-24 21:16:22 UTC (rev 1049) @@ -80,7 +80,7 @@ h# f.0000 constant suspend-base \ In the DOS hole h# f.0008 constant resume-entry -h# f.0800 constant resume-data +h# f.1000 constant resume-data \ If you change these, also change {g/l}xmsrs.fth and {g/l}xearly.fth h# fd00.0000 constant fw-map-base Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2008-12-24 21:05:15 UTC (rev 1048) +++ cpu/x86/pc/olpc/resume.bth 2008-12-24 21:16:22 UTC (rev 1049) @@ -19,6 +19,7 @@ \ This code will be copied to RAM at suspend-base +\ create measure-suspend \ create save-display \ create reset-smbus \ create reset-smbus-bitbang @@ -61,7 +62,7 @@ \ Page directory VA in AX ax si mov \ Save PDIR VA - 0 [si] cx mov \ Save old PDIR entry 0 + 0 [si] cx mov forget-msr \ Save old PDIR entry 0 h# 83 # 0 [ax] mov \ Punch a 4M mapping 0->0 into the page directory cr3 ax mov ax cr3 mov \ Invalide the TLB to activate the mapping h# f0060 # ax mov ax jmp \ Jump to suspend-physical, disabling paging @@ -101,19 +102,23 @@ cld h# 38 [bp] di lea \ Save area +[ifdef] measure-suspend + rdtsc eax h# 10 #) mov edx h# 14 #) mov +[then] + [ifdef] save-msrs h# 30 [bp] si mov \ MSR table 0 [si] bl mov begin - 1 [si] cx mov + 1 [si] cx mov forget-msr 5 # si add begin \ loop count in bl, msr# in cx rdmsr \ msr.lo in ax, msr.hi in dx ax stos dx ax mov ax stos - cx inc + cx inc forget-msr bl dec 0= until 0 [si] bl mov @@ -130,8 +135,28 @@ h# 4c00.0015 rmsr ax stos dx ax mov ax stos \ DOTPLL [ifdef] save-display + \ Wait until it's safe to set the DCONLOAD bit; if you do it at the wrong time + \ you get screen artifacts + + \ Wait for VSYNC + begin + dc-pci-base h# 6c + #) ax mov \ DC_LINE_CNT/STATUS Register + h# 2000.0000 # ax test \ VSYNC bit + 0<> until + + \ Wait until the line count is 38. + \ Testing shows that it suffices to wait for any line in the range 36..911 + \ If DCONLOAD is cleared during lines 0..35, display artifacts will appear + \ at the bottom of the screen. + begin + dc-pci-base h# 6c + #) ax mov \ DC_LINE_CNT/STATUS Register + h# 3ff # ax and \ DOT_LINE_CNT field + d# 38 # ax cmp + = until \ Loop until line count is 38 (empirically good) + \ Freeze image by clearing the DCONLOAD bit (0x800) in the GPIO output register - h# 0800.0000 h# 1000 port-wl + h# 5140.000c rmsr h# 00 [ax] dx lea \ GPIO output port + h# 0800.0000 # ax mov ax dx out [then] \ Save the GPIO setup @@ -146,7 +171,7 @@ h# e0 [bx] dx lea dx ax in ax stos \ GPIO_MAP_Z h# 38 [bx] dx lea \ Low bank - first contiguous GPIO register - h# 3c /l / # cx mov \ Register count (stop at lock register) + h# 3c /l / # cx mov forget-msr \ Register count (stop at lock register) begin dx ax in \ Read GPIO control register ax stos \ Save @@ -160,7 +185,7 @@ [ifndef] omit-high-gpio-restore \ This is probably unnecessary, as these registers may be in the suspend well h# b8 [bx] dx lea \ High bank - first contiguous GPIO register - h# 3c /l / # cx mov \ Register count (stop at lock register) + h# 3c /l / # cx mov forget-msr \ Register count (stop at lock register) begin ax dx in \ Read GPIO control register ax stos \ Save @@ -178,13 +203,22 @@ [ifdef] save-display \ \ h# 3c 0 do i gp@ l!+ 4 +loop h# 4c gp@ l!+ -\ h# f # cx mov gp-pci-base set-base begin 0 [bx] ax mov ax stos 4 # bx add loopa +\ h# f # cx mov forget-msr gp-pci-base set-base begin 0 [bx] ax mov ax stos 4 # bx add loopa \ gp-pci-base h# 4c + #) ax mov ax stos + gp-pci-base set-base + h# 00 reg-save h# 04 reg-save h# 08 reg-save h# 0c reg-save + h# 10 reg-save h# 14 reg-save h# 18 reg-save h# 1c reg-save + h# 20 reg-save h# 24 reg-save h# 28 reg-save h# 2c reg-save + h# 30 reg-save h# 34 reg-save h# 38 reg-save ( h# 3c reg-save ) + ( h# 40 reg-save h# 44 reg-save h# 48 reg-save ) h# 4c reg-save + h# 50 reg-save h# 54 reg-save ( h# 58 reg-save h# 5c reg-save ) + h# 60 reg-save h# 64 reg-save h# 68 reg-save h# 6c reg-save + h# 70 reg-save h# 74 reg-save h# 78 reg-save ( h# 7c reg-save ) vp-pci-base set-base h# 400 reg-save h# 408 reg-save h# 418 reg-save h# 8 reg-save - 0 # h# 38 [bx] mov h# 100 # cx mov begin h# 40 reg-save loopa \ Gamma + 0 # h# 38 [bx] mov h# 100 # cx mov forget-msr begin h# 40 reg-save loopa \ Gamma h# 410 reg-save dc-pci-base set-base @@ -195,7 +229,7 @@ h# 40 reg-save h# 44 reg-save h# 48 reg-save h# 50 reg-save h# 54 reg-save h# 58 reg-save h# 60 reg-save h# 64 reg-save h# 68 reg-save - 0 # h# 70 [bx] mov h# 100 # cx mov begin h# 74 reg-save loopa + 0 # h# 70 [bx] mov h# 100 # cx mov forget-msr begin h# 74 reg-save loopa h# 80 reg-save h# 84 reg-save h# 8 reg-save h# 4 reg-save @@ -246,7 +280,7 @@ \ MFGPTs 0-5. MFGPT 6 and 7 are in the standby domain, live during suspend h# 1800 # dx mov \ MFGPT base port - h# 18 # cx mov \ Save registers up to h# 30. + h# 18 # cx mov forget-msr \ Save registers up to h# 30. begin op: dx ax in op: ax stos @@ -286,8 +320,8 @@ [ifdef] save-display \ Wait until the DCON has loaded a frame - DCONIRQ=1 and DCONSTAT=10 - d# 50,000 # cx mov \ 50K spins is about 40 mS - h# 1030 # dx mov + h# 5140.000c rmsr h# 30 [ax] dx lea \ GPIO data port + d# 50,000 # cx mov forget-msr \ 50K spins is about 40 mS begin dx ax in h# e0 # al and h# c0 # al cmp loopne [then] @@ -295,11 +329,16 @@ \ Checksum memory from 1M to top (excluding framebuffer) bx bx xor h# 0010.0000 # si mov - h# 0ef0.0000 2 rshift # cx mov \ Word count + h# 0ef0.0000 2 rshift # cx mov forget-msr \ Word count begin ax lods ax bx add loopa bx resume-data h# 10 - #) mov \ Save checksum [then] +[ifdef] measure-suspend + di 0 #) mov + rdtsc ax h# 18 #) mov dx h# 1c #) mov +[then] + \ Stop video refresh h# 4758 # dc-pci-base #) mov \ Unlock DC registers h# 0 # dc-pci-base 4 + #) mov \ Turn off access to display memory @@ -333,7 +372,7 @@ \ Setup the register values in advance so the active instruction sequence \ is as short as possible, thus keeping all the activity in one cache line. h# 4. # dx mov # ax mov \ Value to write to MSR - h# 2000.2004 # cx mov \ GLD_MSR_PM MSR number + h# 2000.2004 # cx mov forget-msr \ GLD_MSR_PM MSR number h# 2000 # bx mov \ Value to write to PM1_CNT register h# 1848 # di mov \ PM1_CNT I/O port number @@ -345,7 +384,7 @@ wrmsr \ Write GLD_MSR_PM to self-refresh memory di dx mov bx ax mov ax dx out \ Write PM1_CNT to initial suspend - h# fff # cx mov begin nop loopa \ Spin in this cache line while going down + h# fff # cx mov forget-msr begin nop loopa \ Spin in this cache line while going down \ If the processor didn't really go down, perhaps because a wakeup event was \ already pending, restart the memory clocks and proceed as with a wakeup @@ -371,6 +410,10 @@ h# 20 resume-progress +[ifdef] measure-suspend + rdtsc eax h# 20 #) mov edx h# 24 #) mov +[then] + [ifndef] save-msrs \ MSR init h# 30 [bp] si mov \ MSR table start address @@ -378,7 +421,7 @@ h# 34 [bp] bx add \ MSR table end address begin - ax lods ax cx mov \ msr# + ax lods ax cx mov forget-msr \ msr# ax lods ax dx mov \ msr.hi ax lods \ msr.lo wrmsr @@ -392,7 +435,7 @@ \ Checksum memory from 1M to top (excluding framebuffer) bx bx xor h# 0010.0000 # si mov - h# 0ef0.0000 2 rshift # cx mov \ Word count + h# 0ef0.0000 2 rshift # cx mov forget-msr \ Word count begin ax lods ax bx add loopa bx resume-data h# 10 - #) cmp <> if ret then [then] @@ -404,14 +447,14 @@ 0 [di] bl mov begin - 1 [di] cx mov + 1 [di] cx mov forget-msr 5 # di add begin \ loop count in bl, msr# in cx ax lods ax dx mov ax lods ax dx xchg \ msr.lo in ax, msr.hi in dx wrmsr - cx inc + cx inc forget-msr bl dec 0= until 0 [di] bl mov @@ -441,7 +484,7 @@ h# 14 [bx] dx lea ax dx out \ Deselect OUT AUX2 h# 34 [bx] dx lea ax dx out \ Deselect IN AUX1 - d# 16 # cx mov \ Generate 8 low pulses on SMB_CLOCK + d# 16 # cx mov forget-msr \ Generate 8 low pulses on SMB_CLOCK begin \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add @@ -450,7 +493,7 @@ cx bx mov \ Save cx for use by rmsr h# 5140.000c rmsr ax dx mov \ GPIO output register h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK - bx cx mov \ Restore cx + bx cx mov forget-ms \ Restore cx \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add @@ -459,7 +502,7 @@ cx bx mov \ Save cx for use by rmsr h# 5140.000c rmsr ax dx mov \ GPIO output register h# 4000 # ax mov ax dx out \ Set SMB_CLOCK - bx cx mov \ Restore cx + bx cx mov forget-msr \ Restore cx loopa \ 5 uS delay (slightly longer for GX) @@ -477,7 +520,7 @@ ax lods h# e0 [bx] dx lea ax dx out \ GPIO_MAP_Z h# 38 [bx] dx lea \ Low bank - first contiguous GPIO register - h# 3c /l / # cx mov \ Register count (stop at lock register) + h# 3c /l / # cx mov forget-msr \ Register count (stop at lock register) begin ax lods ax dx out \ Write to GPIO control register @@ -496,7 +539,7 @@ [ifndef] omit-high-gpio-restore \ This is probably unnecessary, as these registers may be in the suspend well h# b8 [bx] dx lea \ High bank - first contiguous GPIO register - h# 3c /l / # cx mov \ Register count (stop at lock register) + h# 3c /l / # cx mov forget-msr \ Register count (stop at lock register) begin ax lods ax dx out \ Write to GPIO control register @@ -519,24 +562,36 @@ [ifdef] save-display \ \ h# 3c 0 do l@+ i gp! 4 +loop l@+ h# 4c gp! -\ h# f # cx mov gp-pci-base set-base begin ax lods ax 0 [bx] mov 4 # bx add loopa +\ h# f # cx mov forget-msr gp-pci-base set-base begin ax lods ax 0 [bx] mov 4 # bx add loopa \ ax lods ax gp-pci-base h# 4c + #) mov \ Synchronize the flat panel turn-on with the DCON blanking -\ d# 50,000 # cx mov \ 50K spins is about 40 mS -\ h# 1030 # dx mov \ GPIO data port +\ h# 5140.000c rmsr h# 30 [ax] dx lea \ GPIO data port +\ h# 1030 # dx mov +\ d# 50,000 # cx mov forget-msr \ 50K spins is about 40 mS \ begin dx ax in h# 1000 # ax test loope \ Wait for blanking + gp-pci-base set-base + h# 00 reg-restore h# 04 reg-restore h# 08 reg-restore h# 0c reg-restore + h# 10 reg-restore h# 14 reg-restore h# 18 reg-restore h# 1c reg-restore + h# 20 reg-restore h# 24 reg-restore h# 28 reg-restore h# 2c reg-restore + h# 30 reg-restore h# 34 reg-restore h# 38 reg-restore ( h# 3c reg-restore ) + ( h# 40 reg-restore h# 44 reg-restore h# 48 reg-restore ) h# 4c reg-restore + h# 50 reg-restore h# 54 reg-restore ( h# 58 reg-restore h# 5c reg-restore ) + h# 60 reg-restore h# 64 reg-restore h# 68 reg-restore h# 6c reg-restore + h# 70 reg-restore h# 74 reg-restore h# 78 reg-restore ( h# 7c reg-save ) + vp-pci-base set-base 0 # h# 50 [bx] mov \ Power on for DACs, enable gamma correction h# 400 reg-restore h# 408 reg-restore h# 418 reg-restore h# 8 reg-restore - 0 # h# 38 [bx] mov h# 100 # cx mov begin h# 40 reg-restore loopa \ Gamma + 0 # h# 38 [bx] mov h# 100 # cx mov forget-msr begin h# 40 reg-restore loopa \ Gamma h# 410 reg-restore -\ d# 1,000,000 # cx mov begin h# 410 [bx] ax mov 1 # al test loope \ Panel power up +h# 34 resume-progress +\ d# 1,000,000 # cx mov forget-msr begin h# 410 [bx] ax mov 1 # al test loope \ Panel power up dc-pci-base set-base @@ -548,25 +603,34 @@ h# 40 reg-restore h# 44 reg-restore h# 48 reg-restore h# 50 reg-restore h# 54 reg-restore h# 58 reg-restore h# 60 reg-restore h# 64 reg-restore h# 68 reg-restore - 0 # h# 70 [bx] mov h# 100 # cx mov begin h# 74 reg-restore loopa + 0 # h# 70 [bx] mov h# 100 # cx mov forget-msr begin h# 74 reg-restore loopa h# 80 reg-restore h# 84 reg-restore +h# 35 resume-progress \ Synchronize the VGA turn-on with the DCON blanking - d# 50,000 # cx mov \ 50K spins is about 40 mS h# 5140.000c rmsr h# 30 [ax] dx lea \ GPIO data port + d# 50,000 # cx mov forget-msr \ 50K spins is about 40 mS begin dx ax in h# 1000 # ax test loope \ Wait for blanking h# 8 reg-restore h# 4 reg-restore +h# 36 resume-progress 0 # dc-pci-base #) mov \ Lock -\ d# 100,000 # cx mov begin h# 80 # ax in loopa \ Delay about 100 ms + \ Turn on the flat panel power as soon as possible + \ The 400.0000 bit make the panel power-up timers use the 14 MHz clock + \ instead of the 32 kHz clock. That is supposed to be only for simulation, + \ but we have DCON between the CPU and the panel, so we don't need delays. + h# 500.0000 # vp-pci-base h# 410 + #) mov - d# 80,000 # cx mov begin h# 80 # a in loopa \ Wait for panel power up +\ XX d# 80,000 # cx mov forget-msr begin h# 80 # ax in loopa \ Wait for panel power up + d# 1,000 # cx mov forget-msr begin h# 80 # ax in loopa \ Wait for panel power up +h# 36 resume-progress \ Unfreeze image by setting the DCONLOAD bit (0x800) in the GPIO output register h# 5140.000c rmsr ax dx mov \ GPIO output register h# 0800 # ax mov ax dx out +h# 37 resume-progress [else] \ Turn on the flat panel power as soon as possible \ The 400.0000 bit make the panel power-up timers use the 14 MHz clock @@ -661,7 +725,7 @@ \ the delay time with other work, but it doesn't matter because the \ later CaFe chip setup will stall anyway. - d# 32 # cx mov \ Loop count (usually ready in 20 uS) + d# 32 # cx mov forget-msr \ Loop count (usually ready in 20 uS) dx dec dx dec \ SMBUS reg1 (status) begin dx al in @@ -673,7 +737,7 @@ al dx out \ Initiate address out cycle \ Another possible split point, in case we should need to overlap - d# 256 # cx mov \ Loop count (usually ready in 172 uS) + d# 256 # cx mov forget-msr \ Loop count (usually ready in 172 uS) dx inc \ SMBUS reg1 (status) begin dx al in @@ -694,7 +758,7 @@ \ MFGPTs 0-5. MFGPT 6 and 7 are in the standby domain, live during suspend h# 1800 # dx mov \ MFGPT base port - h# 18 # cx mov + h# 18 # cx mov forget-msr begin op: ax lods ax ax test 0<> if op: ax dx out then dx inc dx inc @@ -719,7 +783,6 @@ [then] h# 2a resume-progress - \ Restore CaFe configuration h# 6010 config-setup ax lods ax dx out \ NAND BAR @@ -730,7 +793,7 @@ ax lods ax h# 2c [bx] mov \ NAND Timing 3 h# 6004 config-setup op: ax lods op: ax dx out \ NAND enables - op: ax lods ax cx mov \ SDHCI enables - save for later + op: ax lods ax cx mov forget-msr \ SDHCI enables - save for later h# 6110 config-setup ax lods ax dx out \ SDHCI BAR ax bx mov \ Base address 6 h# 6104 config-ww \ Enable access @@ -743,7 +806,7 @@ \ Empirically, they are readable! op: h# 0004 # h# 6a [bx] mov \ Magic recipe from Marvell op: h# 7fff # h# 60 [bx] mov \ Magic recipe from Marvell - h# 6104 config-setup ax lods op: ax dx out \ SDHCI enables +\ h# 6104 config-setup ax lods op: ax dx out \ SDHCI enables h# 610d config-setup al lods al dx out \ SDHCI latency timer h# 613c config-setup al lods al dx out \ SDHCI IRQ h# 6104 config-setup cx ax mov op: ax dx out \ Set SDHCI enables after restoring mapped registers @@ -774,7 +837,9 @@ ax dc-pci-base h# 88 + #) mov \ DV_CTL register - sets framebuffer mem offset fb-pci-base # dc-pci-base h# 84 + #) mov \ GLIU0 Memory offset +[ifndef] save-display fb-pci-base # gp-pci-base h# 4c + #) mov \ GP base +[then] fb-pci-base h# 80.0000 + # vp-pci-base h# 460 + #) mov \ Flat panel base (GX only) \ There is a lot of other stuff that must be done to turn on the @@ -784,11 +849,16 @@ \ DCON fiddling \ USB +[ifdef] measure-suspend + rdtsc eax h# 28 #) mov edx h# 2c #) mov + si 4 #) mov +[then] + h# 2c resume-progress h# 2c [bp] di mov \ VA of suspend-base in di h# 28 [bp] si mov \ PDIR VA - h# 24 [bp] cx mov \ PDIR entry 0 + h# 24 [bp] cx mov forget-msr \ PDIR entry 0 h# 20 [bp] ax mov ax cr4 mov h# 1c [bp] ax mov ax cr3 mov h# 18 [bp] ax mov Modified: cpu/x86/pc/olpc/suspend.fth =================================================================== --- cpu/x86/pc/olpc/suspend.fth 2008-12-24 21:05:15 UTC (rev 1048) +++ cpu/x86/pc/olpc/suspend.fth 2008-12-24 21:16:22 UTC (rev 1049) @@ -49,6 +49,31 @@ [then] \ sum-forth ; +dev screen + : gp-wait-idle ( -- ) begin h# 44 gp@ h# 15 and h# 10 = until ; + : wait-vsync ( -- ) begin 6c dc@ h# 2000.0000 and until ; + : wait-!vsync ( -- ) begin 6c dc@ h# 2000.0000 and 0= until ; + : wait-frames ( n -- ) 0 ?do wait-vsync wait-!vsync wait-vsync loop ; + : dot-line ( -- n ) 6c dc@ h# 3ff and ; + : wait-suspend ( -- ) + disable-interrupts + dot-line d# 28 < if wait-vsync then + begin dot-line d# 25 d# 27 between until + ; +dend +: kb-suspend ( -- ) + sci-wakeup + begin + begin 1 ms key? while key dup [char] q = abort" Quit" emit repeat +\ " gp-wait-idle" screen-ih $call-method +\ 2 " wait-frames" screen-ih $call-method + noop +\ " wait-vsync" screen-ih $call-method +\ " wait-suspend" screen-ih $call-method +\ d# 550 us \ 520 is sufficient + s3 + again +; : suspend " video-save" screen-ih $call-method \ Freeze display s3

1 0

r1048 - cpu/x86/pc/olpc
by svn＠openfirmware.info Dec. 24, 2008

Dec. 24, 2008

Author: wmb Date: 2008-12-24 22:05:15 +0100 (Wed, 24 Dec 2008) New Revision: 1048 Modified: cpu/x86/pc/olpc/copynand.fth Log: OLPC scan-nand command - fixed "Stack Overflow" message that happened if the NAND had a lot of non-JFFS2 blocks, as could happen as a result of booting Windows XP on the machine. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2008-12-24 00:56:57 UTC (rev 1047) +++ cpu/x86/pc/olpc/copynand.fth 2008-12-24 21:05:15 UTC (rev 1048) @@ -401,7 +401,7 @@ \ Not completely erased load-base /nand-block written? if 5 exit then [else] - ( adr ) h# 40 written? if 5 then + ( adr ) h# 40 written? if 5 exit then [then] \ Erased

1 0

r1047 - forth/wrapper
by svn＠openfirmware.info Dec. 24, 2008

Dec. 24, 2008

Author: wmb Date: 2008-12-24 01:56:57 +0100 (Wed, 24 Dec 2008) New Revision: 1047 Modified: forth/wrapper/wrapper.c Log: wrapper.c - removed a test printf from the signal handler. Modified: forth/wrapper/wrapper.c =================================================================== --- forth/wrapper/wrapper.c 2008-12-24 00:49:38 UTC (rev 1046) +++ forth/wrapper/wrapper.c 2008-12-24 00:56:57 UTC (rev 1047) @@ -1143,9 +1143,6 @@ exit_handler(sig) int sig; { - printf("Mama\n"); - while (1) ; - #ifdef HAVE_PSIGNAL psignal(sig, "forth"); #else

1 0