OpenBIOS January 2008

openbios@openbios.org

11 participants
52 discussions

r768 - cpu/x86/pc/olpc dev/olpc/cafenand

by svn＠openbios.org

Author: wmb Date: 2008-01-05 23:43:38 +0100 (Sat, 05 Jan 2008) New Revision: 768 Modified: cpu/x86/pc/olpc/copynand.fth dev/olpc/cafenand/badblock.fth Log: OLPC trac 5870 - Improve error handling in NAND driver. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2008-01-05 01:06:40 UTC (rev 767) +++ cpu/x86/pc/olpc/copynand.fth 2008-01-05 22:43:38 UTC (rev 768) @@ -269,7 +269,8 @@ #image-eblocks 0 ?do (cr i . read-image-block - load-base /nand-block + " read-next-block" $call-nand ( ) + load-base /nand-block + " read-next-block" $call-nand ( end? ) + " More image file blocks than NAND blocks" ?nand-abort ( ) load-base load-base /nand-block + /nand-block comp if ( ) cr ." Miscompare in block starting at page# " ( ) " scan-page#" $call-nand .x cr ( ) @@ -310,8 +311,8 @@ #crc-records 0 ?do (cr i . - load-base " read-next-block" $call-nand ( ) - + load-base " read-next-block" $call-nand ( end? ) + " More CRC records than NAND blocks" ?nand-abort ( ) load-base /nand-block $crc i >crc l@ ( actual-crc expected-crc ) 2dup <> if ( actual-crc expected-crc ) cr ." CRC miscompare - expected " . ." got " . ( ) Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2008-01-05 01:06:40 UTC (rev 767) +++ dev/olpc/cafenand/badblock.fth 2008-01-05 22:43:38 UTC (rev 768) @@ -162,17 +162,17 @@ ; \ Read the bad block table from NAND to memory -: read-bbt-pages ( page# -- ) +: read-bbt-pages ( page# -- error? ) bbt swap /bbt /page / ( adr page# #pages ) \ Can't use read-blocks because of block-bad? dependency bounds ?do ( adr ) dup i read-page if ( adr ) ." BBT has uncorrectable errors" cr - abort + drop true unloop exit then ( adr ) /page + ( adr' ) loop ( adr ) - drop + drop false ; \ Find a bad block table @@ -181,8 +181,8 @@ alloc-bbt find-existing-bbt - bbt0 if bbt0 read-bbt-pages exit then - bbt1 if bbt1 read-bbt-pages exit then + bbt0 if bbt0 read-bbt-pages 0= if exit then then + bbt1 if bbt1 read-bbt-pages 0= if exit then then release-bbt ; @@ -348,7 +348,7 @@ headers -: (next-page#) ( -- true | page# false ) +: next-page# ( -- true | page# false ) partition-size scan-page# pages/eblock + ?do i block-bad? 0= if i to scan-page# @@ -357,9 +357,6 @@ pages/eblock +loop true ; -: next-page# ( -- page# ) - (next-page#) if ." No more good NAND blocks" cr abort then -; 0 value test-page @@ -397,7 +394,7 @@ ; : copy-block ( adr -- page# error? ) - begin (next-page#) 0= while ( adr page# ) + begin next-page# 0= while ( adr page# ) 2dup copy&check if nip partition-start + false exit then ( adr page# ) \ Error; retry once dup erase-block ( adr page# ) @@ -417,21 +414,22 @@ r> drop ; : put-cleanmarkers ( show-xt -- ) - begin (next-page#) 0= while ( show-xt page# ) + begin next-page# 0= while ( show-xt page# ) dup put-cleanmarker ( show-xt page# ) partition-start + pages/eblock / over execute ( show-xt ) repeat ( show-xt ) drop ; -: read-next-block ( adr -- ) - next-page# pages/eblock bounds ?do ( adr ) +: read-next-block ( adr -- no-more? ) + next-page# if drop true exit then ( adr page# ) + pages/eblock bounds ?do ( adr ) dup i read-page if ( adr ) ." Uncorrectable error in page 0x" i .x cr then /page + ( adr' ) loop ( adr ) - drop ( ) + drop false ( flag ) ; \ : start-verify ( -- )

13 years, 1 month

r767 - cpu/x86/pc/olpc

by svn＠openbios.org

Author: wmb Date: 2008-01-05 02:06:40 +0100 (Sat, 05 Jan 2008) New Revision: 767 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC - Disable EC indexed I/O before some game-key functions just in case. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-05 00:43:59 UTC (rev 766) +++ cpu/x86/pc/olpc/fw.bth 2008-01-05 01:06:40 UTC (rev 767) @@ -511,24 +511,24 @@ : ?games ( -- ) rocker-right game-key? if + ec-indexed-io-off time&date 5drop 1 and if pong else life-demo then then ; : ?diags ( -- ) rocker-left game-key? if + ec-indexed-io-off text-on " test-all" eval ." Tests complete - powering off" cr d# 5000 ms power-off then ; : ?scan-nand ( -- ) - rocker-up game-key? if text-on scan-nand then + rocker-up game-key? if ec-indexed-io-off text-on scan-nand then ; : ?fs-update ( -- ) button-check button-x or button-o or button-square or ( mask ) - game-key-mask = if - try-fs-update - then + game-key-mask = if ec-indexed-io-off try-fs-update then ; : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then

13 years, 1 month

r766 - dev/mmc/sdhci ofw/core

by svn＠openbios.org

Author: wmb Date: 2008-01-05 01:43:59 +0100 (Sat, 05 Jan 2008) New Revision: 766 Modified: dev/mmc/sdhci/selftest.fth ofw/core/ofwcore.fth Log: OLPC trac 5853 - Improved messages from test-all diagnostics. Modified: dev/mmc/sdhci/selftest.fth =================================================================== --- dev/mmc/sdhci/selftest.fth 2008-01-05 00:39:52 UTC (rev 765) +++ dev/mmc/sdhci/selftest.fth 2008-01-05 00:43:59 UTC (rev 766) @@ -26,15 +26,18 @@ ibuf obuf /block comp ; +: (selftest) ( -- error? ) + sbuf 0 read-block if true exit then + 0 h# 5a test-block if true exit then + 0 h# a5 test-block if true exit then + sbuf 0 write-block \ Restore original content +; external : selftest ( -- error? ) open 0= if ." Open /sd failed" cr true exit then attach-card 0= if ." No card inserted" cr close false exit then alloc-test-bufs - sbuf 0 read-block if free-test-bufs close true exit then - 0 h# 5a test-block if free-test-bufs close true exit then - 0 h# a5 test-block if free-test-bufs close true exit then - sbuf 0 write-block \ Restore original content + ['] (selftest) catch if true then free-test-bufs close ; Modified: ofw/core/ofwcore.fth =================================================================== --- ofw/core/ofwcore.fth 2008-01-05 00:39:52 UTC (rev 765) +++ ofw/core/ofwcore.fth 2008-01-05 00:43:59 UTC (rev 766) @@ -3209,15 +3209,23 @@ ??cr ." Testing " pwd method-name 2@ current-device ( method-adr,len phandle ) - execute-phandle-method drop ( result ) - - ?dup if + execute-phandle-method if ( result ) + ?dup if + red-letters + ??cr ." Selftest failed. Return code = " .d cr cr + d# 10000 ms + black-letters + else + green-letters + ." Okay" cr cr d# 3000 ms + black-letters + then + else red-letters - ??cr ." Selftest failed. Return code = " .d cr + ." Selftest failed due to abort" cr d# 10000 ms black-letters then - then ( ) ;

13 years, 1 month

r765 - cpu/x86/pc/olpc

by svn＠openbios.org

Author: wmb Date: 2008-01-05 01:39:52 +0100 (Sat, 05 Jan 2008) New Revision: 765 Modified: cpu/x86/pc/olpc/gamekeys.fth Log: OLPC trac 5585 - Stack cleanup for game key status display. Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2008-01-04 00:31:23 UTC (rev 764) +++ cpu/x86/pc/olpc/gamekeys.fth 2008-01-05 00:39:52 UTC (rev 765) @@ -27,6 +27,7 @@ button-square 7 3 show-key button-check d# 11 3 show-key button-x 9 4 show-key + drop ; : read-game-keys ( -- )

13 years, 1 month

r764 - cpu/x86/pc/olpc

by svn＠openbios.org

Author: wmb Date: 2008-01-04 01:31:23 +0100 (Fri, 04 Jan 2008) New Revision: 764 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac 5692 - Elaborated the "EC problem - remove all power" message. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-02 23:30:27 UTC (rev 763) +++ cpu/x86/pc/olpc/fw.bth 2008-01-04 00:31:23 UTC (rev 764) @@ -555,7 +555,8 @@ ?resume-botch board-revision 0= if - ." EC problem - remove all power and restart" cr + ." EC problem - disconnect the battery and AC adapter," cr + ." reconnect them, and restart." cr begin again then

13 years, 1 month

r763 - forth/wrapper

by svn＠openbios.org

Author: wmb Date: 2008-01-03 00:30:27 +0100 (Thu, 03 Jan 2008) New Revision: 763 Modified: forth/wrapper/logger.c forth/wrapper/wrapper.c Log: This goes with svn 761 - I missed a couple of files in the checkin list. Modified: forth/wrapper/logger.c =================================================================== --- forth/wrapper/logger.c 2008-01-02 23:29:23 UTC (rev 762) +++ forth/wrapper/logger.c 2008-01-02 23:30:27 UTC (rev 763) @@ -227,7 +227,7 @@ #endif char cwdbuf[MAXPATHLEN*2]; -#ifdef UNIX +#ifdef __unix__ #ifdef MAJC char *hostname = "some_MAJC_machine"; #else @@ -235,17 +235,21 @@ (void) gethostname(hostname, 64); #endif #endif + #ifdef DOS char *hostname = "some_NT_machine"; #endif + #ifdef WIN32 char hostname[MAX_COMPUTERNAME_LENGTH+1]; long hostnamelen = MAX_COMPUTERNAME_LENGTH+1; (void) GetComputerName(hostname, &hostnamelen); #endif + #ifdef MACOS char *hostname = "some_Macintosh"; #endif + #ifdef USE_STDIO char *hostname = "some_machine"; #endif Modified: forth/wrapper/wrapper.c =================================================================== --- forth/wrapper/wrapper.c 2008-01-02 23:29:23 UTC (rev 762) +++ forth/wrapper/wrapper.c 2008-01-02 23:30:27 UTC (rev 763) @@ -55,29 +55,11 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef UNIX -#include <sys/mman.h> -#include <sys/mman.h> -#include <limits.h> /* for PAGESIZE */ -#ifndef PAGESIZE -#define PAGESIZE 4096 + +#ifdef __linux__ +char *host_os = "Linux"; +#define SYS5 1 #endif -#ifdef MAJC -#include <sys/unistd.h> -#else -#define HAVE_PSIGNAL -#include <unistd.h> -#endif -#include <sys/param.h> -#endif -#ifdef MACOS -#include <events.h> -#include <files.h> -#include <console.h> -#endif -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> #ifdef WIN32 #define ENV_DELIM ';' @@ -153,21 +135,12 @@ #define HOST_LITTLE_ENDIAN #endif -#ifdef __linux__ -char *host_os = "Linux"; -#define SYS5 1 #ifdef HOSTPOWERPC -#define LinuxPOWERPC char *host_cpu = "powerpc"; -#else -# ifdef __i386__ -# ifndef CKERNEL -# define LinuxX86 -# define HOST_LITTLE_ENDIAN -# endif +# ifdef __linux__ +# define LinuxPOWERPC # endif #endif -#endif #ifdef NT char *host_os = "nt"; @@ -202,8 +175,14 @@ #define START_OFFSET 4 #endif -#ifdef X86 +#ifdef __i386__ char *host_cpu = "x86"; +# ifndef CKERNEL +# define HOST_LITTLE_ENDIAN +# endif +#endif + +#ifdef TARGET_X86 char *target_cpu = "x86"; #define CPU_MAGIC 0x4d503400 #define START_OFFSET 0 @@ -220,95 +199,121 @@ #include <errno.h> +#ifdef __unix__ +# include <sys/mman.h> +# include <sys/mman.h> +# include <limits.h> /* for PAGESIZE */ +# ifndef PAGESIZE +# define PAGESIZE 4096 +# endif +# ifdef MAJC +# include <sys/unistd.h> +# else +# define HAVE_PSIGNAL +# include <unistd.h> +# endif +# include <sys/param.h> +#endif + +#ifdef MACOS +# include <events.h> +# include <files.h> +# include <console.h> +#endif + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + typedef long quadlet; #ifdef WIN32 -#include <windows.h> +# include <windows.h> #endif #ifdef BSD -#include <sys/time.h> -#include <sys/ioctl.h> /* For FIONREAD */ +# include <sys/time.h> +# include <sys/ioctl.h> /* For FIONREAD */ #endif #ifdef SYS5 -#define USE_TERMIOS +# define USE_TERMIOS #endif #ifdef BSD -#define USE_TERMIOS +# define USE_TERMIOS #endif #ifdef DEMON -#define USE_STDIO +# define USE_STDIO #endif #ifdef USE_STDIO -#include <stdio.h> +# include <stdio.h> #endif /* fcntl.h will define this if the system needs it; otherwise we use 0 */ #ifndef _O_BINARY -#ifdef O_BINARY -#define _O_BINARY O_BINARY -#else -#define _O_BINARY 0 +# ifdef O_BINARY +# define _O_BINARY O_BINARY +# else +# define _O_BINARY 0 +# endif #endif -#endif #ifndef MAXPATHLEN -#define MAXPATHLEN 256 +# define MAXPATHLEN 256 #endif #include <signal.h> #ifdef TARGET_POWERPC -#ifdef LinuxPOWERPC -#define NOGLUE -#else -extern void glue(); +# ifdef LinuxPOWERPC +# define NOGLUE +# else + extern void glue(); +# endif #endif -#endif #ifdef AIX -extern void _sync_cache_range(char *, long); + extern void _sync_cache_range(char *, long); #endif -#ifdef UNIX -INTERNAL void exit_handler(); +#ifdef __unix__ + INTERNAL void exit_handler(); # ifdef BSD -INTERNAL void cont_handler(); -INTERNAL void stop_handler(); + INTERNAL void cont_handler(); + INTERNAL void stop_handler(); # endif #endif #ifdef WIN32 -#define isatty _isatty -#define kbhit _kbhit -#define getch _getch -#define open _open -#define close _close -#define read _read -#define write _write -#define lseek _lseek -#define unlink _unlink -#define access _access -#define stat _stat -#define getcwd _getcwd -#define chdir _chdir +# define isatty _isatty +# define kbhit _kbhit +# define getch _getch +# define open _open +# define close _close +# define read _read +# define write _write +# define lseek _lseek +# define unlink _unlink +# define access _access +# define stat _stat +# define getcwd _getcwd +# define chdir _chdir -INTERNAL int getnum(char *); -INTERNAL void error(char *, char*); + INTERNAL int getnum(char *); + INTERNAL void error(char *, char*); #else -INTERNAL void error(); + INTERNAL void error(); #endif extern char *rootname(); extern char *basename(); #ifndef LinuxPOWERPC -extern int read(), write(); + extern int read(), write(); #endif INTERNAL char * substr(); @@ -322,13 +327,14 @@ INTERNAL long f_ioctl(); INTERNAL long f_lseek(); INTERNAL long f_crstr(); + #ifdef PPCSIM -/* These are not INTERNAL because the PowerPC simulator uses then */ + /* These are not INTERNAL because the PowerPC simulator uses then */ long c_key(); long s_bye(); #else -INTERNAL long c_key(); -INTERNAL long s_bye(); + INTERNAL long c_key(); + INTERNAL long s_bye(); #endif INTERNAL long c_emit(); @@ -378,15 +384,16 @@ #ifdef JTAG #include "jtag.h" #endif + #if defined (BSD) || defined (__linux__) INTERNAL long s_timeofday(); #endif + #if defined(USE_TERMIOS) INTERNAL long c_setraw(), c_setbaud(), c_setparity(), c_setattr(); INTERNAL long c_getattr(), c_drain(); #endif - long nop() { @@ -442,7 +449,7 @@ pathname, /* 156 */ -#ifdef UNIX +#ifdef __unix__ m_sbrk, #else nop, @@ -470,6 +477,7 @@ f_mkdir, f_rmdir, /* 200 */ s_getwd0, + #ifdef WIN32 #include "win32fun.c" #include "jtagfun.c" @@ -477,18 +485,21 @@ /* Windows socket stuff 204 .. 264 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, #endif + #ifdef JTAG #include "jtagfun.c" #else /* 268 .. 344 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, #endif + #if defined(BSD) || defined(__linux__) /* 348 */ s_timeofday, #else 0, #endif + #if defined(USE_TERMIOS) /* 352 356 360 364 368 372*/ c_setraw, c_setbaud, c_setparity, c_getattr, c_setattr, c_drain, @@ -536,7 +547,7 @@ * failed system call. */ -#ifdef X86 +#ifdef TARGET_X86 void fsyscall(long callno, long *args) { @@ -611,7 +622,7 @@ } #endif -#ifdef X86 +#ifdef TARGET_X86 int bittest(char *table, int index) { int quot, remain ; @@ -774,7 +785,7 @@ int extrak; char * dictfile; char *targv[10]; -#ifdef X86 +#ifdef TARGET_X86 char *reloc_table ; int delta_org, old_org, code_size ; int code_wsize, cold_code, i ; @@ -860,7 +871,7 @@ exit(1); } -#ifdef X86 +#ifdef TARGET_X86 /* * XXX we should do an additional test to verify that it's * really a Forthmacs dictionary file and not just some other @@ -988,7 +999,7 @@ keymode(); -#ifdef UNIX +#ifdef __unix__ signal(SIGHUP,exit_handler); signal(SIGINT,exit_handler); signal(SIGILL,exit_handler); @@ -1018,7 +1029,7 @@ argc, argv, 1 /* 0=POWER, 1=PowerPC */); #else s_flushcache(loadaddr, dictsize); /* We're about to execute data! */ -# ifdef X86 +# ifdef TARGET_X86 { int (*codep)(); /* There is a pointer to the startup code at offset 0x18 */ @@ -1146,7 +1157,7 @@ s_bye(0L); } else { restoremode(); -#ifdef UNIX +#ifdef __unix__ kill(0,SIGQUIT); #endif } @@ -1173,13 +1184,13 @@ } #endif -#ifdef LinuxX86 +#if defined(__linux__) && defined(__i386__) #include <sys/io.h> #endif INTERNAL long s_ioperm(unsigned long from, unsigned long num, unsigned long on) { -#ifdef LinuxX86 +#if defined(__linux__) && defined(__i386__) return (long)ioperm(from, num, (int)on); #else return -1L; @@ -1205,7 +1216,7 @@ int nchars = 0; fflush(stdout); -# ifdef UNIX +# ifdef __unix__ # ifdef SYS5 # ifdef __linux__ no_waitchar (0); @@ -1703,7 +1714,7 @@ INTERNAL long syserror() { -#ifndef UNIX +#ifndef __unix__ extern int errno; #endif @@ -1716,7 +1727,7 @@ pr_error(errnum) long errnum; { -#ifndef UNIX +#ifndef __unix__ extern int errno; #endif @@ -1792,7 +1803,7 @@ output_fd = result; } #else -#ifdef UNIX +#ifdef __unix__ result = open(expand_name(name), O_RDWR|O_CREAT|O_TRUNC, (int)mode); #else result = open(expand_name(name), _O_BINARY|O_RDWR|O_CREAT|O_TRUNC, (int)mode); @@ -1905,7 +1916,7 @@ long fd, code; char *buf; { -#ifdef UNIX +#ifdef __unix__ return((long)ioctl((int)fd, (int)code, buf)); #else return((long)-1); @@ -2160,7 +2171,7 @@ return((long)mem); } -#ifdef UNIX +#ifdef __unix__ INTERNAL long m_sbrk(size) long size;

13 years, 1 month

r762 - cpu/x86/pc/olpc

by svn＠openbios.org

Author: wmb Date: 2008-01-03 00:29:23 +0100 (Thu, 03 Jan 2008) New Revision: 762 Modified: cpu/x86/pc/olpc/gamekeys.fth Log: OLPC game key display - changed "o" to "." for non-pressed keys, thus making it clearer which keys are down. Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2008-01-02 23:28:13 UTC (rev 761) +++ cpu/x86/pc/olpc/gamekeys.fth 2008-01-02 23:29:23 UTC (rev 762) @@ -13,7 +13,7 @@ 0 value game-key-mask : show-key ( mask x y -- ) - at-xy game-key-mask and if ." *" else ." o" then + at-xy game-key-mask and if ." *" else ." ." then ; : update-game-keys ( mask -- ) dup game-key-mask or to game-key-mask

13 years, 1 month

r761 - in cpu: ppc/Linux ppc/build x86/Linux

by svn＠openbios.org

Author: wmb Date: 2008-01-03 00:28:13 +0100 (Thu, 03 Jan 2008) New Revision: 761 Added: cpu/ppc/build/Makefile cpu/x86/Linux/Makefile.ppcforth Modified: cpu/ppc/Linux/Makefile cpu/ppc/build/Makefile.cross cpu/x86/Linux/Makefile Log: Improvements to the wrapper #define structure and the wrapper build scripts. Modified: cpu/ppc/Linux/Makefile =================================================================== --- cpu/ppc/Linux/Makefile 2008-01-02 21:41:48 UTC (rev 760) +++ cpu/ppc/Linux/Makefile 2008-01-02 23:28:13 UTC (rev 761) @@ -1,57 +1,36 @@ -# Flags for the simulator version -WRAPPER = pforth +# Makefile for native PowerPC wrapper to run under Linux + OPT = -O # OPT = BP=../../.. -CFLAGS = -DUNIX -DPPCSIM -DTARGET_POWERPC +CFLAGS = -D__linux__ -DHOSTPOWERPC -DTARGET_POWERPC CC = gcc WRDIR = ${BP}/forth/wrapper ZIPDIR = ${WRDIR}/zip -SIMDIR = ../ppcsim ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o -OBJS = wrapsim.o ppcsim.o logger.o ${ZIPOBJS} -TRACEOBJS = wrapsim.o ppcsim.trace.o logger.o ${ZIPOBJS} -SIMROMOBJS = simrom.o ppcsim.simrom.o +OBJS = wrapper.o logger.o ${ZIPOBJS} -all: ppcforth ppcforth.trace +all: ppcforth -ppcforth: $(OBJS) +ppcforth: forth + ln -sf $< $@ + +forth: $(OBJS) $(CC) $(LFLAGS) $(OBJS) -o $@ -ppcforth.trace: $(TRACEOBJS) - $(CC) $(LFLAGS) $(TRACEOBJS) -o $@ - -simrom: $(SIMROMOBJS) - $(CC) $(LFLAGS) $(SIMROMOBJS) -o $@ - -wrapsim.o: ${WRDIR}/wrapper.c - ${CC} -c ${CFLAGS} $< -o $@ - %.o: ${WRDIR}/%.c ${CC} -c ${CFLAGS} $< -o $@ %.o: ${ZIPDIR}/%.c ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ -ppcsim.o: $(SIMDIR)/ppcsim.c - $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -c $< -o $@ - -ppcsim.trace.o: $(SIMDIR)/ppcsim.c - $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -c $< -o $@ - -ppcsim.simrom.o: $(SIMDIR)/ppcsim.c - $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -DSIMROM -c $< -o $@ - -simrom.o: $(SIMDIR)/simrom.c - $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -DSIMROM -c $< -o $@ - clean: - @rm -f *.o ppcforth ppcforth.trace + @rm -f *.o forth ppcforth FRC: Added: cpu/ppc/build/Makefile =================================================================== --- cpu/ppc/build/Makefile (rev 0) +++ cpu/ppc/build/Makefile 2008-01-02 23:28:13 UTC (rev 761) @@ -0,0 +1,27 @@ +OS := $(shell uname) + +all: basefw.dic + +.PHONY: FORCE all clean + +.PRECIOUS: builder.dic + +../${OS}/forth: + @make -C ../${OS} forth + +build: ../${OS}/forth + @ln -sf ../${OS}/forth $@ + +%.dic: FORCE build + ./build $@ + +builder.dic: FORCE build + -[ ! -f builder.sav ] && cp builder.dic builder.sav + ./build builder.dic + +inflate.bin: + make -C ../${OS} ../build/inflate.bin + +# Don't use *.dic so as not to remove builder.dic +clean: + rm -f tools.dic kernel.dic basefw.dic *.log headers *~ inflate.bin build Modified: cpu/ppc/build/Makefile.cross =================================================================== --- cpu/ppc/build/Makefile.cross 2008-01-02 21:41:48 UTC (rev 760) +++ cpu/ppc/build/Makefile.cross 2008-01-02 23:28:13 UTC (rev 761) @@ -1,8 +1,36 @@ # This setting of HOSTDIR is for cross-building on an x86 Linux system # For it to work, you first need to build the simulator version of ppcforth -# in cpu/ppc/Linux and then copy the ppcforth file to cpu/x86/Linux -HOSTDIR:=$(shell pwd)/../../../cpu/x86/Linux/ +# in cpu/x86/Linux with "make -f Makefile.ppcforth" +OS := $(shell uname) -builder.dic: - HOSTDIR=${HOSTDIR} build $@ +HOSTCPU:=x86 +HOSTDIR:=../../${HOSTCPU}/${OS} +all: basefw.dic + +.PHONY: FORCE all clean + +.PRECIOUS: builder.dic + +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth + +${HOSTDIR}/ppcforth: + @make -C ${HOSTDIR} -f Makefile.ppcforth ppcforth + +build: ${HOSTDIR}/forth + @ln -sf $< $@ + +%.dic: FORCE build ${HOSTDIR}/ppcforth + ./build $@ + +builder.dic: FORCE build + -[ ! -f builder.sav ] && cp builder.dic builder.sav + ./build builder.dic + +inflate.bin: + make -C ../${OS} ../build/inflate.bin + +# Don't use *.dic so as not to remove builder.dic +clean: + rm -f tools.dic kernel.dic basefw.dic *.log headers *~ inflate.bin build Modified: cpu/x86/Linux/Makefile =================================================================== --- cpu/x86/Linux/Makefile 2008-01-02 21:41:48 UTC (rev 760) +++ cpu/x86/Linux/Makefile 2008-01-02 23:28:13 UTC (rev 761) @@ -1,11 +1,9 @@ # Wrapper makefile for x86 Unix: FreeBSD, Linux, etc. # Copyright 1997 FirmWorks. All rights reserved. # -OS := $(shell uname) - BP=../../.. -CFLAGS = -O -g -m32 -DUNIX -D${OS} -DX86 +CFLAGS = -O -g -m32 -DTARGET_X86 # CFLAGS += -DUSE_XCB WRTAIL = forth/wrapper Added: cpu/x86/Linux/Makefile.ppcforth =================================================================== --- cpu/x86/Linux/Makefile.ppcforth (rev 0) +++ cpu/x86/Linux/Makefile.ppcforth 2008-01-02 23:28:13 UTC (rev 761) @@ -0,0 +1,56 @@ +# Flags for the simulator version +OPT = -O +# OPT = + +BP=../../.. + +CFLAGS = -DPPCSIM -DTARGET_POWERPC + +CC = gcc + +WRDIR = ${BP}/forth/wrapper +ZIPDIR = ${WRDIR}/zip +SIMDIR = ${BP}/cpu/ppc/ppcsim + +ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o + +OBJS = wrapsim.o ppcsim.o logger.o ${ZIPOBJS} +TRACEOBJS = wrapsim.o ppcsim.trace.o logger.o ${ZIPOBJS} +SIMROMOBJS = simrom.o ppcsim.simrom.o + +all: ppcforth ppcforth.trace + +ppcforth: $(OBJS) + $(CC) $(LFLAGS) $(OBJS) -o $@ + +ppcforth.trace: $(TRACEOBJS) + $(CC) $(LFLAGS) $(TRACEOBJS) -o $@ + +simrom: $(SIMROMOBJS) + $(CC) $(LFLAGS) $(SIMROMOBJS) -o $@ + +wrapsim.o: ${WRDIR}/wrapper.c + ${CC} -c ${CFLAGS} $< -o $@ + +%.o: ${WRDIR}/%.c + ${CC} -c ${CFLAGS} $< -o $@ + +%.o: ${ZIPDIR}/%.c + ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + +ppcsim.o: $(SIMDIR)/ppcsim.c + $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -c $< -o $@ + +ppcsim.trace.o: $(SIMDIR)/ppcsim.c + $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -c $< -o $@ + +ppcsim.simrom.o: $(SIMDIR)/ppcsim.c + $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -DSIMROM -c $< -o $@ + +simrom.o: $(SIMDIR)/simrom.c + $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -DSIMROM -c $< -o $@ + +clean: + @rm -f *.o ppcforth ppcforth.trace + +FRC:

13 years, 1 month

r760 - in cpu/ppc: . build

by svn＠openbios.org

Author: wmb Date: 2008-01-02 22:41:48 +0100 (Wed, 02 Jan 2008) New Revision: 760 Added: cpu/ppc/build/Makefile.cross Modified: cpu/ppc/build/builder.dic cpu/ppc/kernel.bth cpu/ppc/savemeta.fth Log: PowerPC build - some minor improvements to the PowerPC build scripts, which still need work. Added: cpu/ppc/build/Makefile.cross =================================================================== --- cpu/ppc/build/Makefile.cross (rev 0) +++ cpu/ppc/build/Makefile.cross 2008-01-02 21:41:48 UTC (rev 760) @@ -0,0 +1,8 @@ +# This setting of HOSTDIR is for cross-building on an x86 Linux system +# For it to work, you first need to build the simulator version of ppcforth +# in cpu/ppc/Linux and then copy the ppcforth file to cpu/x86/Linux +HOSTDIR:=$(shell pwd)/../../../cpu/x86/Linux/ + +builder.dic: + HOSTDIR=${HOSTDIR} build $@ + Modified: cpu/ppc/kernel.bth =================================================================== --- cpu/ppc/kernel.bth 2008-01-02 19:08:27 UTC (rev 759) +++ cpu/ppc/kernel.bth 2008-01-02 21:41:48 UTC (rev 760) @@ -79,7 +79,7 @@ fload ${BP}/cpu/ppc/savemeta.fth -.( --- Saving kernel.dic ---) "" kernel.dic save-meta +.( --- Saving kernel.dic ---) " kernel.dic" $save-meta cr \ LICENSE_BEGIN Modified: cpu/ppc/savemeta.fth =================================================================== --- cpu/ppc/savemeta.fth 2008-01-02 19:08:27 UTC (rev 759) +++ cpu/ppc/savemeta.fth 2008-01-02 21:41:48 UTC (rev 760) @@ -28,14 +28,14 @@ : swap-size ( -- n ) here-t >swap-map-size-t ; : user-base ( -- adr ) userarea-t ; : user-size ( -- n ) user-size-t doubleword-align ; -: save-meta ( str -- ) +: $save-meta ( str -- ) \ Doubleword alignment is required so that the user area image will \ not be in the same doubleword as the end of the dictionary, thus \ causing the copy loop to get the wrong value the first time. begin here-t 7 and while 0 c,-t repeat - new-file + $new-file \ Set the text and data sizes in the program header h# 4800.0020 header h# 0 + l-t! \ Branch past the header

13 years, 1 month

r759 - cpu/ppc/build

by svn＠openbios.org

Author: wmb Date: 2008-01-02 20:08:27 +0100 (Wed, 02 Jan 2008) New Revision: 759 Added: cpu/ppc/build/builder.dic Log: Initial checkin Property changes on: cpu/ppc/build/builder.dic ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

13 years, 1 month