January 2011 - openfirmware - mail.coreboot.org

[commit] r2129 - in cpu/x86: Darwin Linux
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Thu Jan 20 01:01:07 2011 New Revision: 2129 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2129 Log: Makefile frobbing - use consistent brace type. Modified: cpu/x86/Darwin/Makefile cpu/x86/Linux/Makefile Modified: cpu/x86/Darwin/Makefile ============================================================================== --- cpu/x86/Darwin/Makefile Thu Jan 20 00:40:27 2011 (r2128) +++ cpu/x86/Darwin/Makefile Thu Jan 20 01:01:07 2011 (r2129) @@ -6,8 +6,8 @@ MFLAGS = -m32 OPT = -O -CFLAGS = -g $(MFLAGS) -DTARGET_X86 -LFLAGS = $(MFLAGS) +CFLAGS = -g ${MFLAGS} -DTARGET_X86 +LFLAGS = ${MFLAGS} # Extra CFLAGS needed by Darwin hosts. GCC doesn't define __unix__ here, # so we must include it ourselves. @@ -49,7 +49,7 @@ # Use x86forth when you need to compile new dictionaries that will # run on x86 systems. forth: ${OBJS} - ${CC} $(MFLAGS) -o $@ ${OBJS} + ${CC} ${MFLAGS} -o $@ ${OBJS} @ln -sf forth x86forth %.o: ${WRDIR}/%.c @@ -75,7 +75,7 @@ wrapsim.o: ${WRDIR}/wrapper.c ${CC} -c ${ARMCFLAGS} -c $< -o $@ -armsim.trace.o: $(ARMDIR)/armsim.c +armsim.trace.o: ${ARMDIR}/armsim.c ${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@ armforth: ${ARMSIMOBJS} Modified: cpu/x86/Linux/Makefile ============================================================================== --- cpu/x86/Linux/Makefile Thu Jan 20 00:40:27 2011 (r2128) +++ cpu/x86/Linux/Makefile Thu Jan 20 01:01:07 2011 (r2129) @@ -6,8 +6,8 @@ MFLAGS = -m32 OPT = -O -CFLAGS = -g $(MFLAGS) -DTARGET_X86 -LFLAGS = $(MFLAGS) +CFLAGS = -g ${MFLAGS} -DTARGET_X86 +LFLAGS = ${MFLAGS} # Uncomment these lines to include X windows support to the wrapper # via libxcb. The libxcb development package (headers, etc) must be @@ -44,7 +44,7 @@ @ln -sf forth x86forth inflate.lo: ${ZIPDIR}/inflate.c - ${CC} -c $(MFLAGS) -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ + ${CC} -c ${MFLAGS} -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ inflate.o: inflate.lo ${LD} -melf_i386 -T inflate.ld $< -o $@ @@ -71,14 +71,14 @@ wrapsim.o: ${WRDIR}/wrapper.c ${CC} -c ${ARMCFLAGS} -c $< -o $@ -armsim.trace.o: $(ARMDIR)/armsim.c +armsim.trace.o: ${ARMDIR}/armsim.c ${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@ armforth: ${ARMSIMOBJS} - ${CC} ${ARMSIMOBJS} -o $@ + ${CC} ${LFLAGS} ${ARMSIMOBJS} -o $@ armforth.trace: ${ARMTRACEOBJS} - ${CC} ${ARMTRACEOBJS} -o $@ + ${CC} ${LFLAGS} ${ARMTRACEOBJS} -o $@ clean: @rm -f forth x86forth armforth *.o *~ inflate.bin

1 0

[commit] r2128 - cpu/x86/Darwin
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Thu Jan 20 00:40:27 2011 New Revision: 2128 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2128 Log: Fixed LFLAGS problem in Darwin Makefile. Modified: cpu/x86/Darwin/Makefile Modified: cpu/x86/Darwin/Makefile ============================================================================== --- cpu/x86/Darwin/Makefile Thu Jan 20 00:32:43 2011 (r2127) +++ cpu/x86/Darwin/Makefile Thu Jan 20 00:40:27 2011 (r2128) @@ -79,10 +79,10 @@ ${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@ armforth: ${ARMSIMOBJS} - ${CC} ${ARMSIMOBJS} -o $@ + ${CC} ${LFLAGS} ${ARMSIMOBJS} -o $@ armforth.trace: ${ARMTRACEOBJS} - ${CC} ${ARMTRACEOBJS} -o $@ + ${CC} ${LFLAGS} ${ARMTRACEOBJS} -o $@ clean: @rm -f forth x86forth armforth *.o *~ inflate.bin

1 0

[commit] r2127 - in cpu: arm/openmoko/build x86/Darwin x86/Linux
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Thu Jan 20 00:32:43 2011 New Revision: 2127 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2127 Log: Makefile frobbing to make the Darwin Makefile correspond to the Linux Makefile. Modified: cpu/arm/openmoko/build/Makefile cpu/x86/Darwin/Makefile cpu/x86/Linux/Makefile Modified: cpu/arm/openmoko/build/Makefile ============================================================================== --- cpu/arm/openmoko/build/Makefile Thu Jan 20 00:28:37 2011 (r2126) +++ cpu/arm/openmoko/build/Makefile Thu Jan 20 00:32:43 2011 (r2127) @@ -18,12 +18,15 @@ tags: ${ROMNAME}.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ${HOSTDIR}/armforth ./build $@ ${HOSTDIR}/forth: @make -C ${HOSTDIR} forth +${HOSTDIR}/armforth: + @make -C ${HOSTDIR} armforth + ../../build/inflate.bin: @make -C ../../build inflate.bin Modified: cpu/x86/Darwin/Makefile ============================================================================== --- cpu/x86/Darwin/Makefile Thu Jan 20 00:28:37 2011 (r2126) +++ cpu/x86/Darwin/Makefile Thu Jan 20 00:32:43 2011 (r2127) @@ -2,67 +2,87 @@ BP=../../.. -CFLAGS = -g -m32 -DTARGET_X86 +# Flags for the OS and CPU +MFLAGS = -m32 + +OPT = -O +CFLAGS = -g $(MFLAGS) -DTARGET_X86 +LFLAGS = $(MFLAGS) # 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 +SIMCFLAGS += -D__unix__=1 -Wimplicit-function-declaration WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL} + +ifdef OMIT_ZIP +ZIPDIR = ${WRDIR} +ZIPOBJS = nullzip.o +INFLATEBIN = +else 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 +INFLATEBIN = ../../build/inflate.bin # 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 $@ + ${CC} -c ${MFLAGS} -O0 -fpic $< -o $@ # Well, we're not going to get objcopy in a generic OS X environment, so # let's just fake it. ../build/inflate.bin: inflate.o - # ${OBJCOPY} -O binary $< $@ dd if=$< of=$@ bs=256 skip=1 +endif + +OBJS = wrapper.o logger.o ${ZIPOBJS} + +all: forth x86forth ${INFLATEBIN} + +# 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} $(MFLAGS) -o $@ ${OBJS} + @ln -sf forth x86forth %.o: ${WRDIR}/%.c - ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + ${CC} -c ${OPT} ${CFLAGS} $< -o $@ %.o: ${ZIPDIR}/%.c - ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + ${CC} -c ${OPT} ${CFLAGS} -I${ZIPDIR} $< -o $@ + +# ARM simulator wrapper build rules + +ARMDIR = ${BP}/cpu/arm +ARMCFLAGS = -g ${MFLAGS} -DARMSIM -DTARGET_ARM -DARM -DSIMNEXT +ARMSIMOBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS} +ARMTRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS} + +# Extra CFLAGS needed by Darwin hosts. GCC doesn't define __unix__ here, +# so we must include it ourselves. +ARMCFLAGS += -D__unix__=1 -Wimplicit-function-declaration + +%.o: ${ARMDIR}/%.c + ${CC} -c ${ARMCFLAGS} $< -o $@ + +wrapsim.o: ${WRDIR}/wrapper.c + ${CC} -c ${ARMCFLAGS} -c $< -o $@ + +armsim.trace.o: $(ARMDIR)/armsim.c + ${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@ + +armforth: ${ARMSIMOBJS} + ${CC} ${ARMSIMOBJS} -o $@ + +armforth.trace: ${ARMTRACEOBJS} + ${CC} ${ARMTRACEOBJS} -o $@ clean: - @rm -f forth x86forth *.o *~ inflate.bin + @rm -f forth x86forth armforth *.o *~ inflate.bin Modified: cpu/x86/Linux/Makefile ============================================================================== --- cpu/x86/Linux/Makefile Thu Jan 20 00:28:37 2011 (r2126) +++ cpu/x86/Linux/Makefile Thu Jan 20 00:32:43 2011 (r2127) @@ -2,7 +2,12 @@ BP=../../.. -CFLAGS = -O -g -m32 -DTARGET_X86 +# Flags for the OS and CPU +MFLAGS = -m32 + +OPT = -O +CFLAGS = -g $(MFLAGS) -DTARGET_X86 +LFLAGS = $(MFLAGS) # Uncomment these lines to include X windows support to the wrapper # via libxcb. The libxcb development package (headers, etc) must be @@ -13,11 +18,19 @@ WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL} + +ifdef OMIT_ZIP +ZIPDIR = ${WRDIR} +ZIPOBJS = nullzip.o +INFLATEBIN = +else ZIPTAIL = ${WRTAIL}/zip ZIPDIR = ${BP}/${ZIPTAIL} ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o +endif + OBJS += wrapper.o logger.o ${ZIPOBJS} all: forth x86forth ../build/inflate.bin @@ -27,11 +40,11 @@ # Use x86forth when you need to compile new dictionaries that will # run on x86 systems. forth: ${OBJS} - ${CC} -m32 -o $@ ${OBJS} ${LIBS} + ${CC} ${MFLAGS} -o $@ ${OBJS} ${LIBS} @ln -sf forth x86forth inflate.lo: ${ZIPDIR}/inflate.c - ${CC} -c -m32 -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ + ${CC} -c $(MFLAGS) -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ inflate.o: inflate.lo ${LD} -melf_i386 -T inflate.ld $< -o $@ @@ -40,15 +53,15 @@ objcopy -O binary $< $@ %.o: ${WRDIR}/%.c - ${CC} -c ${CFLAGS} $< -o $@ + ${CC} -c ${OPT} ${CFLAGS} $< -o $@ %.o: ${ZIPDIR}/%.c - ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + ${CC} -c ${OPT} ${CFLAGS} -I${ZIPDIR} $< -o $@ # ARM simulator wrapper build rules ARMDIR = ${BP}/cpu/arm -ARMCFLAGS = -g -m32 -DARMSIM -DTARGET_ARM -DARM -DSIMNEXT +ARMCFLAGS = -g ${MFLAGS} -DARMSIM -DTARGET_ARM -DARM -DSIMNEXT ARMSIMOBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS} ARMTRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS}

1 0

[commit] r2126 - forth/wrapper
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Thu Jan 20 00:28:37 2011 New Revision: 2126 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2126 Log: Mostly-cosmetic changes to the wrapper. You can turn on simulator sign-on chattiness by defining VERBOSE. Modified: forth/wrapper/wrapper.c Modified: forth/wrapper/wrapper.c ============================================================================== --- forth/wrapper/wrapper.c Thu Jan 20 00:26:40 2011 (r2125) +++ forth/wrapper/wrapper.c Thu Jan 20 00:28:37 2011 (r2126) @@ -347,11 +347,11 @@ INTERNAL long f_crstr(); #if defined(PPCSIM) || defined (ARMSIM) - /* These are not INTERNAL because the PowerPC simulator uses then */ - long c_key(); - long s_bye(); - void simulate(); - void restoremode(); + /* These are not INTERNAL because the simulators use then */ + long c_key(); + long s_bye(); + void simulate(); + void restoremode(); #else INTERNAL long c_key(); INTERNAL long s_bye(); @@ -1002,9 +1002,15 @@ dictsize = sizeof(header) + imagesize + extrasize ; dictsize += 16; /* Allow for alignment */ -# ifdef PPCSIM +# ifdef VERBOSE +# ifdef PPCSIM printf("PowerPC Instruction Set Simulator\n"); printf("Copyright 1994 FirmWorks All rights reserved\n"); +# elif ARMSIM + printf("ARM Instruction Set Simulator\n"); + printf("Copyright 1994 FirmWorks All rights reserved\n"); + printf("Copyright 2010 Apple, Inc. All rights reserved\n"); +# endif # endif loadaddr = (char *)m_alloc(dictsize); @@ -1063,7 +1069,6 @@ loadaddr, functions, ((long)loadaddr+dictsize - 16) & ~15, argc, argv, 1 /* 0=POWER, 1=PowerPC */); #elif defined(ARMSIM) - // printf("loadaddr = 0x%x\n",loadaddr); simulate(0L, loadaddr, loadaddr, functions, ((long)loadaddr+dictsize - 16) & ~15, argc, argv); #else

1 0

[commit] r2125 - forth/lib
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Thu Jan 20 00:26:40 2011 New Revision: 2125 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2125 Log: Added "x86" to CPU type recognizer script (alternative i*86) Modified: forth/lib/hostcpu.sh Modified: forth/lib/hostcpu.sh ============================================================================== --- forth/lib/hostcpu.sh Thu Jan 20 00:25:52 2011 (r2124) +++ forth/lib/hostcpu.sh Thu Jan 20 00:26:40 2011 (r2125) @@ -4,6 +4,7 @@ sun4*) CPUNAME=sparc ;; ppc) CPUNAME=powerpc ;; i*86) CPUNAME=x86 ;; + x86*) CPUNAME=x86 ;; mips) CPUNAME=mips ;; arm*) CPUNAME=arm ;; sun3) CPUNAME=m68k ;;

1 0

[commit] r2124 - forth/kernel
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Thu Jan 20 00:25:52 2011 New Revision: 2124 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2124 Log: Added fixme: directive to kernel. Modified: forth/kernel/kernel.fth Modified: forth/kernel/kernel.fth ============================================================================== --- forth/kernel/kernel.fth Thu Jan 20 00:25:34 2011 (r2123) +++ forth/kernel/kernel.fth Thu Jan 20 00:25:52 2011 (r2124) @@ -3082,6 +3082,7 @@ : command: [compile] \ ; : in: [compile] \ ; : dictionary: [compile] \ ; +: fixme: ." FIXME: " -1 parse type cr ; \ From cmdline.fth

1 0

[commit] r2123 - forth/lib
by repository service Jan. 20, 2011

Jan. 20, 2011

Author: wmb Date: Thu Jan 20 00:25:34 2011 New Revision: 2123 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2123 Log: Added fixme: directive to builder. Modified: forth/lib/builder.fth Modified: forth/lib/builder.fth ============================================================================== --- forth/lib/builder.fth Wed Jan 19 23:48:49 2011 (r2122) +++ forth/lib/builder.fth Thu Jan 20 00:25:34 2011 (r2123) @@ -500,6 +500,9 @@ \ : debug-in: ['] in: (debug ; +: fixme: ." FIXME: " -1 parse type cr ; + + previous definitions \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

[commit] r2122 - cpu/arm
by repository service Jan. 19, 2011

Jan. 19, 2011

Author: wmb Date: Wed Jan 19 23:48:49 2011 New Revision: 2122 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2122 Log: Copied ppc/fixvoc.fth to arm/fixvoc.fth to eliminate ARM build dependency on PPC subtree. Added: cpu/arm/fixvoc.fth Modified: cpu/arm/kernel.bth Added: cpu/arm/fixvoc.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/fixvoc.fth Wed Jan 19 23:48:49 2011 (r2122) @@ -0,0 +1,52 @@ +purpose: Fixup vocabularies at the end of kernel metacompilation +\ See license at end of file + +only forth meta also forth also definitions +\ Nasty kludge to resolve the to pointer to the does> clause of vocabulary +\ within "forth". The problem is that the code field of "forth" contains +\ a call instruction to the does> clause of vocabulary. This call is a +\ forward reference which cannot be resolved in the same way as compiled +\ addresses. + +: used-t ( definer-acf child-acf -- ) + [ also meta ] token!-t [ previous ] +; + +: fix-vocabularies ( -- ) + [""] <vocabulary> also symbols find previous ( acf true | str false ) + 0= abort" Can't find <vocabulary> in symbols" + dup resolution@ >r ( acf ) ( Return stack: <vocabulary>-adr ) + dup first-occurrence@ ( acf occurrence ) + \ Don't let fixall muck with this entry later + 0 rot >first-occurrence ! ( occurrence ) + begin another-occurrence? while ( occurrence ) + dup [ meta ] token@-t [ forth ] swap ( next-occurrence occurrence ) + \ Calculate the longword offset to the vocabulary does> clause + r@ swap used-t + repeat + r> drop +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/arm/kernel.bth ============================================================================== --- cpu/arm/kernel.bth Wed Jan 19 23:47:46 2011 (r2121) +++ cpu/arm/kernel.bth Wed Jan 19 23:48:49 2011 (r2122) @@ -59,7 +59,7 @@ \ : : : lastacf .name cr ; fload ${BP}/cpu/arm/target.fth fload ${BP}/forth/kernel/forward.fth -fload ${BP}/cpu/ppc/fixvoc.fth +fload ${BP}/cpu/arm/fixvoc.fth fload ${BP}/forth/kernel/metacompile.fth fload ${BP}/cpu/arm/metarel.fth

1 0

[commit] r2121 - cpu/arm
by repository service Jan. 19, 2011

Jan. 19, 2011

Author: wmb Date: Wed Jan 19 23:47:46 2011 New Revision: 2121 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2121 Log: ARM assembler / disassembler enhancements thanks to Mike Tuciarone. Modified: cpu/arm/assem.fth cpu/arm/disassem.fth Modified: cpu/arm/assem.fth ============================================================================== --- cpu/arm/assem.fth Wed Jan 19 23:42:31 2011 (r2120) +++ cpu/arm/assem.fth Wed Jan 19 23:47:46 2011 (r2121) @@ -951,6 +951,7 @@ : bl 0b00.0000 {cond} amode-bbl ; : bx 012f.ff10 {cond} amode-bx ; +: blx 012f.ff30 {cond} amode-bx ; : swp 0100.0090 {cond} {b} amode-swp ; : strex 0180.0f90 {cond} {bh} amode-swp ; Modified: cpu/arm/disassem.fth ============================================================================== --- cpu/arm/disassem.fth Wed Jan 19 23:42:31 2011 (r2120) +++ cpu/arm/disassem.fth Wed Jan 19 23:47:46 2011 (r2121) @@ -52,6 +52,7 @@ swap >mask and ( field ) ; : 4bits ( right-bit -- field ) 4 bits ; +: 8bits ( right-bit -- field ) 8 bits ; : bit? ( bit# -- f ) instruction @ 1 rot lshift and 0<> ; \ Extracts an index from the field "bit# #bits", indexes into the string \ "adr len", which is assumed to contain substrings of length /entry, @@ -83,12 +84,13 @@ : op.rd, ( -- ) op-col .rd, ; : .rb ( -- ) d# 16 .reg ; alias .rn .rb +: rn ( -- rn ) d# 16 4bits ; : .rm,shift ( -- ) .rm - d# 4 8 bits if \ LSL #0 is no-shift; this isn't it + d# 4 8bits if \ LSL #0 is no-shift; this isn't it ., - 4 8 bits 6 = if ." rrx" exit then + 4 8bits 6 = if ." rrx" exit then 5 2 " lsllsrasrror" 3 .fld ." " 4 bit? if .rs else ." #" 7 5 bits .d then then @@ -96,7 +98,7 @@ : u.h ( n -- ) dup d# 9 u> if ." 0x" then (u.) type ; : ror ( n cnt -- ) 2dup d# 32 swap - lshift -rot rshift or ; -: .imm ( -- ) 0 8 bits 8 4bits 2* ror u.h ; +: .imm ( -- ) 0 8bits 8 4bits 2* ror u.h ; : ?.bit ( adr len bit# -- ) bit? if type else 2drop then ; @@ -159,6 +161,9 @@ ." wrc" {<cond>} op-col .rn ; +: .clz ( -- ) + ." clz" {<cond>} op.rd, .rm +; : .mrs/sr ( -- ) d#21 bit? if \ MSR instruction @ h# 00cf.fff8 and h# 0000.f000 = if @@ -169,6 +174,10 @@ .wrc exit then + instruction @ h# 0fff.0ff0 and h# 016f.0f10 = if + .clz + exit + then ." msr" {<cond>} op-col .psr .fields ., .r/imm else \ MRS @@ -198,9 +207,11 @@ : p-bit ( -- flag ) d#24 bit? ; \ LD/ST extension space -\ SWP{<cond>} Rd, Rm, [Rn] cond 0001 00ZZ Rn Rd SBZ 1001 Rm \ LDR{<cond>}{H|SH|SB} Rd, Rm, [Rn] cond 000P UBW1 Rn Rd addr 1SH1 addr \ STR{<cond>}{H|SH|SB} Rd, Rm, [Rn] cond 000P UBW0 Rn Rd addr 1SH1 addr +\ SWP{<cond>}{B} Rd, Rm, [Rn] cond 0001 0BZZ Rn Rd SBZ 1001 Rm +\ LDREX{<cond>}{H|B} Rd, [Rn] cond 0001 1BH1 Rn Rd SBO 1001 SBO +\ STREX{<cond>}{H|B} Rd, Rm, [Rn] cond 0001 1BH0 Rn Rd SBO 1001 Rm : imm8 ( -- n ) 8 4bits 4 lshift 0 4bits or ; : ,.r/imm8 ( -- ) d#22 bit? if @@ -215,9 +226,20 @@ op.rd, .[ .rn p-bit if ,.r/imm8 .] {!} else .] ,.r/imm8 then ; -: .swp ( -- ) ." swp" {<cond>} " b" d#22 ?.bit op.rd, .rm ., .[ .rn .] ; +: .swp/ex ( -- ) + 8 4bits 0= if + ." swp" {<cond>} " b" d#22 ?.bit op.rd, .rm ., .[ .rn .] + else + .ld/st ." rex" {<cond>} + d#21 2 bits case + 1 of ." d" endof + 2 of ." b" endof + 3 of ." h" endof endcase + op.rd, d#20 bit? 0= if .rm ., then .[ .rn .] + then +; -: .ld/st-ext ( -- ) 5 2 bits if .ldx else .swp then ; +: .ld/st-ext ( -- ) 5 2 bits if .ldx else .swp/ex then ; : .ext ( -- ) \ Extension space d#24 bit? 0= 5 2 bits 0= and if .alu-ext else .ld/st-ext then @@ -322,7 +344,7 @@ [then] : p# ( -- n ) 8 4bits ; : .p#, ( n -- ) ." p" p# n.d ., ; -: .offset8 ( -- ) ." #" +/- 0 8 bits 4 * u.h ; +: .offset8 ( -- ) ." #" +/- 0 8bits 4 * u.h ; : .ldc/stc ( -- ) .ld/st ." c" {<cond>} " l" d#22 ?.bit op-col .p#, d# 12 .creg ., .[ .rn @@ -413,10 +435,29 @@ ['] .ldc/stc compile, \ 6 ['] .coproc compile, \ 7 +: uncond-op ( -- op ) d# 4 bit? ; +: uncond-op1 ( -- op1 ) d# 20 8bits ; +: uncond-op2 ( -- op2 ) d# 4 4bits ; + +: .uncond ( -- ) + uncond-op1 case + h# 57 of uncond-op2 case + 4 of ." dsb" endof + 5 of ." dmb" endof + 6 of ." isb" endof + endcase endof + ." ?" + endcase +; + : disasm ( x -- ) push-hex instruction ! - classes d#25 3 bits ta+ token@ execute + d# 28 4bits h# f = if + .uncond + else + classes d#25 3 bits ta+ token@ execute + then pop-base ;

1 0

[commit] r2120 - cpu/arm/olpc/1.75 dev/usb2/hcd/ehci
by repository service Jan. 19, 2011

Jan. 19, 2011

Author: quozl Date: Wed Jan 19 23:42:31 2011 New Revision: 2120 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2120 Log: OLPC XO-1.75 A2 - use new machine signature CL2 for release after next Modified: cpu/arm/olpc/1.75/spiui.fth dev/usb2/hcd/ehci/intr.fth Modified: cpu/arm/olpc/1.75/spiui.fth ============================================================================== --- cpu/arm/olpc/1.75/spiui.fth Wed Jan 19 08:05:12 2011 (r2119) +++ cpu/arm/olpc/1.75/spiui.fth Wed Jan 19 23:42:31 2011 (r2120) @@ -41,13 +41,16 @@ cr drop ( ) ; +create machine-signature ," CL2" +: downgrade [char] 1 machine-signature count drop 2+ c! ; \ Perform a series of sanity checks on the new firmware image. : check-firmware-image ( adr len -- adr len ) dup /flash <> abort" Wrong image length" ( adr len ) 2dup + h# 40 - ( adr len signature-adr ) - dup " CL1" comp abort" No firmware signature" ( adr len signature-adr ) + dup machine-signature count comp abort" No machine signature" + ( adr len signature-adr ) ." Firmware: " h# 10 type ( adr len ) \ XXX add some more sanity checks ; @@ -80,7 +83,7 @@ ." Got firmware version: " flash-buf h# f.ffc0 + dup h# 10 type cr ( adr ) - " CL1" comp abort" Wrong machine type" + machine-signature count comp abort" Wrong machine signature" ?crc Modified: dev/usb2/hcd/ehci/intr.fth ============================================================================== --- dev/usb2/hcd/ehci/intr.fth Wed Jan 19 08:05:12 2011 (r2119) +++ dev/usb2/hcd/ehci/intr.fth Wed Jan 19 23:42:31 2011 (r2120) @@ -118,8 +118,10 @@ headers +warning @ warning off : (end-extra) ( -- ) (end-extra) end-intr-in ; ' (end-extra) to end-extra +warning ! \ LICENSE_BEGIN

1 0