openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2112 - cpu/arm cpu/mips cpu/ppc cpu/x86 forth/kernel forth/lib
by repository service 18 Jan '11

18 Jan '11

Author: wmb Date: Tue Jan 18 21:25:30 2011 New Revision: 2112 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2112 Log: Kernel - fixed a longstanding inefficiency in the code that handles "is" / "to" for basic datatypes like value and defer. "to <value>" is now much faster, comparable in speed to "<variable> @". Modified: cpu/arm/kerncode.fth cpu/arm/kernel.bth cpu/mips/kerncode.fth cpu/ppc/kerncode.fth cpu/x86/kerncode.fth forth/kernel/kernel.fth forth/lib/decomp.fth Modified: cpu/arm/kerncode.fth ============================================================================== --- cpu/arm/kerncode.fth Mon Jan 17 22:58:06 2011 (r2111) +++ cpu/arm/kerncode.fth Tue Jan 18 21:25:30 2011 (r2112) @@ -133,6 +133,35 @@ meta definitions +code isdefer ( xt -- ) + ldr r0,[ip],1cell \ Get CFA of target word + ldr r0,[r0,1cell] \ Get user number + str tos,[r0,up] \ Store value + pop tos,sp \ Fix stack +c; +code isvalue ( n -- ) + ldr r0,[ip],1cell \ Get CFA of target word + ldr r0,[r0,1cell] \ Get user number + str tos,[r0,up] \ Store value + pop tos,sp \ Fix stack +c; +code isuser ( n -- ) + ldr r0,[ip],1cell \ Get CFA of target word + ldr r0,[r0,1cell] \ Get user number + str tos,[r0,up] \ Store value + pop tos,sp \ Fix stack +c; +code isconstant ( n -- ) + ldr r0,[ip],1cell \ Get CFA of target word + str tos,[r0,1cell] \ Store value + pop tos,sp \ Fix stack +c; +code isvariable ( n -- ) + ldr r0,[ip],1cell \ Get CFA of target word + str tos,[r0,1cell] \ Store value + pop tos,sp \ Fix stack +c; + code (lit) ( -- lit ) psh tos,sp ldr tos,[ip],1cell Modified: cpu/arm/kernel.bth ============================================================================== --- cpu/arm/kernel.bth Mon Jan 17 22:58:06 2011 (r2111) +++ cpu/arm/kernel.bth Tue Jan 18 21:25:30 2011 (r2112) @@ -31,7 +31,6 @@ [ifndef] arm-assembler \ Make sure we have the ARM assembler -order cr only forth also definitions fload ${BP}/forth/lib/bitops.fth Modified: cpu/mips/kerncode.fth ============================================================================== --- cpu/mips/kerncode.fth Mon Jan 17 22:58:06 2011 (r2111) +++ cpu/mips/kerncode.fth Tue Jan 18 21:25:30 2011 (r2112) @@ -207,6 +207,53 @@ meta definitions +code isdefer ( xt -- ) + ip t0 get + ip ainc + + t0 4 t0 lw \ Get user number + t0 up t0 addu \ User area address + tos base tos subu \ relocate xt + tos t0 0 sw \ Store value + sp ainc \ finish popping stack +c; + +code isuser ( xt -- ) + ip t0 get + ip ainc + + t0 4 t0 lw \ Get user number + t0 up t0 addu \ User area address + tos t0 0 sw \ Store value + sp ainc \ finish popping stack +c; + +code isvalue ( xt -- ) + ip t0 get + ip ainc + + t0 4 t0 lw \ Get user number + t0 up t0 addu \ User area address + tos t0 0 sw \ Store value + sp ainc \ finish popping stack +c; + +code isconstant ( xt -- ) + ip t0 get + ip ainc + + tos t0 4 sw \ Store value + sp ainc \ finish popping stack +c; + +code isvariable ( xt -- ) + ip t0 get + ip ainc + + tos t0 4 sw \ Store value + sp ainc \ finish popping stack +c; + \ dovariable constant dovariable \ dodoes constant dodoes Modified: cpu/ppc/kerncode.fth ============================================================================== --- cpu/ppc/kerncode.fth Mon Jan 17 22:58:06 2011 (r2111) +++ cpu/ppc/kerncode.fth Tue Jan 18 21:25:30 2011 (r2112) @@ -190,6 +190,39 @@ meta definitions +code isdefer ( xt -- ) + literal-to-t0 + lwz t0,/cf(t0) \ User number in t0 + stwx tos,t0,up + pop-tos +c; + +code isvalue ( n -- ) + literal-to-t0 + lwz t0,/cf(t0) \ User number in t0 + stwx tos,t0,up + pop-tos +c; + +code isuser ( n -- ) + literal-to-t0 + lwz t0,/cf(t0) \ User number in t0 + stwx tos,t0,up + pop-tos +c; + +code isconstant ( n -- ) + literal-to-t0 + stw tos,/cf(t0) + pop-tos +c; + +code isvariable ( n -- ) + literal-to-t0 + stw tos,/cf(t0) + pop-tos +c; + \ dovariable constant dovariable \ dodoes constant dodoes Modified: cpu/x86/kerncode.fth ============================================================================== --- cpu/x86/kerncode.fth Mon Jan 17 22:58:06 2011 (r2111) +++ cpu/x86/kerncode.fth Tue Jan 18 21:25:30 2011 (r2112) @@ -161,6 +161,39 @@ \ ---- Run-time words compiled by compiling words. +code isdefer ( xt -- ) + 0 [ip] ax mov ip ainc /cf [ax] ax mov ?bswap-ax up ax add \ data address in ax +[ifdef] big-endian-t + ax bx mov ax pop ?bswap-ax ax 0 [bx] mov +[else] + bx pop bx 0 [ax] mov +[then] +c; +code isvalue ( n -- ) + 0 [ip] ax mov ip ainc /cf [ax] ax mov ?bswap-ax up ax add \ data address in ax +[ifdef] big-endian-t + ax bx mov ax pop ?bswap-ax ax 0 [bx] mov +[else] + bx pop bx 0 [ax] mov +[then] +c; +code isuser ( n -- ) + 0 [ip] ax mov ip ainc /cf [ax] ax mov ?bswap-ax up ax add \ data address in ax +[ifdef] big-endian-t + ax bx mov ax pop ?bswap-ax ax 0 [bx] mov +[else] + bx pop bx 0 [ax] mov +[then] +c; +code isconstant ( n -- ) + 0 [ip] bx mov ip ainc + ax pop ?bswap-ax ax /cf [bx] mov +c; +code isvariable ( n -- ) + 0 [ip] bx mov ip ainc + ax pop ?bswap-ax ax /cf [bx] mov +c; + code bswap (s n1 -- n2 ) ax pop Modified: forth/kernel/kernel.fth ============================================================================== --- forth/kernel/kernel.fth Mon Jan 17 22:58:06 2011 (r2111) +++ forth/kernel/kernel.fth Tue Jan 18 21:25:30 2011 (r2112) @@ -1912,6 +1912,13 @@ ' ! token,-t \ constant ' ! token,-t \ variable +create is-ops + ' isdefer token,-t \ defer + ' isuser token,-t \ user variable + ' isvalue token,-t \ value + ' isconstant token,-t \ constant + ' isvariable token,-t \ variable + : associate ( acf -- true | index false ) word-type ( n ) word-types begin ( n adr ) @@ -1957,11 +1964,17 @@ [ifndef] run-time : do-is ( data acf -- ) - dup kerntype? if ( [data] acf ) - state @ if compile (is) token, else (is then - else ( [data] acf ) + dup associate if ( [data] acf ) to-hook - then + else ( [data] acf index ) + state @ if ( acf index ) + is-ops swap ta+ token@ ( acf is-token ) + token, token, ( ) + else ( data acf index ) + tuck data-locs +execute ( data index data-adr ) + swap !ops +execute ( ) + then ( ) + then ( ) ; \ is is the word that is actually used by applications : is \ name ( data -- ) Modified: forth/lib/decomp.fth ============================================================================== --- forth/lib/decomp.fth Mon Jan 17 22:58:06 2011 (r2111) +++ forth/lib/decomp.fth Tue Jan 18 21:25:30 2011 (r2112) @@ -300,7 +300,7 @@ headers : skip-(') ( ip -- ip' ) ta1+ ta1+ ; headerless -: .is ( ip -- ip' ) .cword dup token@ .name ta1+ ; +: .is ( ip -- ip' ) ." to " ta1+ dup token@ .name ta1+ ; : .string-tail ( ip -- ip' ) dup count type +str ; : .string ( ip -- ip' ) .cword .string-tail put" ; : .pstring ( ip -- ip' ) ?cr ." p" put" ta1+ .string-tail put" ; @@ -322,7 +322,7 @@ \ classify each word in a definition \ Common constant for sizing the three classes: -d# 30 constant #decomp-classes +d# 36 constant #decomp-classes #decomp-classes tassociative: execution-class ( token -- index ) ( 0 ) [compile] (lit) ( 1 ) [compile] ?branch @@ -337,9 +337,12 @@ ( 18 ) [compile] (endof) ( 19 ) [compile] (endcase) ( 20 ) [compile] ("s) ( 21 ) [compile] (is) ( 22 ) [compile] (dlit) ( 23 ) [compile] (llit) - ( 24 ) [compile] (n") ( 25 ) [compile] dummy - ( 26 ) [compile] dummy ( 27 ) [compile] dummy - ( 28 ) [compile] dummy ( 29 ) [compile] dummy + ( 24 ) [compile] (n") ( 25 ) [compile] isdefer + ( 26 ) [compile] isuser ( 27 ) [compile] isvalue + ( 28 ) [compile] isconstant ( 29 ) [compile] isvariable + ( 30 ) [compile] dummy ( 31 ) [compile] dummy + ( 32 ) [compile] dummy ( 33 ) [compile] dummy + ( 34 ) [compile] dummy ( 35 ) [compile] dummy \ Print a word which has been classified by execution-class #decomp-classes 1+ case: .execution-class ( ip index -- ip' ) @@ -355,9 +358,12 @@ ( 18 ) .endof ( 19 ) .endcase ( 20 ) .pstring ( 21 ) .is ( 22 ) .dlit ( 23 ) .llit - ( 24 ) .nstring ( 25 ) dummy - ( 26 ) dummy ( 27 ) dummy - ( 28 ) dummy ( 29 ) dummy + ( 24 ) .nstring ( 25 ) .is + ( 26 ) .is ( 27 ) .is + ( 28 ) .is ( 29 ) .is + ( 30 ) dummy ( 31 ) dummy + ( 32 ) dummy ( 32 ) dummy + ( 34 ) dummy ( 35 ) dummy ( default ) .word ; @@ -376,9 +382,12 @@ ( 18 ) skip-branch ( 19 ) skip-word ( 20 ) skip-string ( 21 ) skip-word ( 22 ) skip-dlit ( 23 ) skip-llit - ( 24 ) skip-nstring ( 25 ) dummy - ( 26 ) dummy ( 27 ) dummy - ( 28 ) dummy ( 29 ) dummy + ( 24 ) skip-nstring ( 25 ) skip-word + ( 26 ) skip-word ( 27 ) skip-word + ( 28 ) skip-word ( 29 ) skip-word + ( 30 ) dummy ( 31 ) dummy + ( 32 ) dummy ( 32 ) dummy + ( 34 ) dummy ( 35 ) dummy ( default ) skip-word ;

1 0

[commit] r2111 - dev/olpc/viacamera
by repository service 17 Jan '11

17 Jan '11

Author: wmb Date: Mon Jan 17 22:58:06 2011 New Revision: 2111 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2111 Log: Initial revision of color space converstion code. Added: dev/olpc/viacamera/ycrcbtorgb.fth Added: dev/olpc/viacamera/ycrcbtorgb.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/olpc/viacamera/ycrcbtorgb.fth Mon Jan 17 22:58:06 2011 (r2111) @@ -0,0 +1,141 @@ +\ See license at end of file +purpose: Color space conversion from YCbCr to RGB + +\ R = clip (Y + 1.402 * Cr) +\ G = clip (Y - 0.344 * Cb - 0.714 * Cr) +\ B = clip (Y + 1.772 * Cb) + +\ This is for full-range YCbCr, where the Y anc Cb/Cr values ranges from 0-255. +\ For restricted-range YCbCr (16 <= Y <= 235, 16 <= Cr,Cb <= 240), the Y value +\ would need to be adjusted to Ysc = (Y - 16) * 1.164 (1.164 = 298 / 256 = 149 / 128) +\ and the multipliers change from (1.402, -0.343, -0.711, 1.765) to (1.596, -0.392, -0.813, 2.017) + +code ycrcb444>rgb888 ( y cr cb -- r g b ) + \ y: 8 [sp] + \ u: 4 [sp] = Cr + \ v: 0 [sp] = Cb + + d# 128 # 0 [sp] sub \ convert Cb to signed + d# 128 # 4 [sp] sub \ convert Cr to signed + 8 [sp] bx mov \ Get Y into register + + d# 90 # 4 [sp] ax imul-imm \ Multiply Cr by 1.402 * 64 (actually 1.406) + d# 6 # ax sar \ Scale down by 64 + bx ax add \ Add to Y + 0< if ax ax xor then \ Clip to 0 + d# 255 # ax cmp > if d# 255 # ax mov then \ Clip to 255 + + ax 8 [sp] mov \ Put R in place on stack + + d# -46 # 4 [sp] ax imul-imm \ Multiply Cr by -0.714 * 64 (actually -0.719) + d# 6 # ax sar \ Scale down by 64 + ax cx mov + d# -22 # 0 [sp] ax imul-imm \ Multiply Cr by -0.344 * 64 (actually -0.344) + d# 6 # ax sar \ Scale down by 64 + ax cx add + bx cx add \ Now we have G + 0< if cx cx xor then \ Clip to 0 + d# 255 # cx cmp > if d# 255 # cx mov then \ Clip to 255 + + d# 113 # 0 [sp] ax imul-imm \ Multiply Cr by 1.772 * 64 (actually 1.766) + d# 6 # ax sar \ Scale down by 64 + bx ax add \ Add to Y + 0< if ax ax xor then \ Clip to 0 + d# 255 # ax cmp > if d# 255 # ax mov then \ Clip to 255 + ax 0 [sp] mov \ Put B in place on stack + + cx 4 [sp] mov \ Put G in place on stack +c; + + +\ This version operates on pixel values in memory +\ Src bytes are Cb Y1 Cr Y2 (2 pixels) +\ Dst bytes are R G B A R G B A (2 pixels) + +code ycbcr422>rgba8888 ( src dst count -- ) + 4 [sp] di xchg \ di: dst + 8 [sp] si xchg \ si: src + + ax push ax push \ Space on stack for Cr and Cb values + + begin + \ src: Cb Y1 Cr Y2 dst: R1 G1 B1 A1 R2 G2 B2 A2 + ax ax xor al lods d# 128 # ax sub ax 0 [sp] mov \ Get Cb, make signed, save on stack + ax ax xor al lods ax bx mov \ Get Y1, save in BX + ax ax xor al lods d# 128 # ax sub ax 4 [sp] mov \ Get Cr, make signed, save on stack + + d# 90 # 4 [sp] ax imul-imm \ Multiply Cr by 1.402 * 64 (actually 1.406) + d# 6 # ax sar \ Scale down by 64 + bx ax add \ Add to Y + + 0< if ax ax xor then \ Clip to 0 + d# 255 # ax cmp > if d# 255 # ax mov then \ Clip to 255 + + al stos \ Output R + + d# -46 # 4 [sp] ax imul-imm \ Multiply Cr by -0.714 * 64 (actually -0.719) + d# 6 # ax sar \ Scale down by 64 + ax dx mov + d# -22 # 0 [sp] ax imul-imm \ Multiply Cr by -0.344 * 64 (actually -0.344) + d# 6 # ax sar \ Scale down by 64 + dx ax add + bx ax add \ Now we have G + + 0< if ax ax xor then \ Clip to 0 + d# 255 # ax cmp > if d# 255 # ax mov then \ Clip to 255 + + al stos \ Output G + + d# 113 # 0 [sp] ax imul-imm \ Multiply Cr by 1.772 * 64 (actually 1.766) + d# 6 # ax sar \ Scale down by 64 + bx ax add \ Add to Y + + 0< if ax ax xor then \ Clip to 0 + d# 255 # ax cmp > if d# 255 # ax mov then \ Clip to 255 + + al stos \ Output B + d# 255 # al mov + al stos \ Output A + + ax ax xor al lods ax bx mov \ Get Y2 into BX + + d# 90 # 4 [sp] ax imul-imm \ Multiply Cr by 1.402 * 64 (actually 1.406) + d# 6 # ax sar \ Scale down by 64 + bx ax add \ Add to Y + + 0< if ax ax xor then \ Clip to 0 + d# 255 # ax cmp > if d# 255 # ax mov then \ Clip to 255 + + al stos \ Output R + + d# -46 # 4 [sp] ax imul-imm \ Multiply Cr by -0.714 * 64 (actually -0.719) + d# 6 # ax sar \ Scale down by 64 + ax dx mov + d# -22 # 0 [sp] ax imul-imm \ Multiply Cr by -0.344 * 64 (actually -0.344) + d# 6 # ax sar \ Scale down by 64 + dx ax add + bx ax add \ Now we have G + + 0< if ax ax xor then \ Clip to 0 + d# 255 # ax cmp > if d# 255 # ax mov then \ Clip to 255 + + al stos \ Output G + + d# 113 # 0 [sp] ax imul-imm \ Multiply Cr by 1.772 * 64 (actually 1.766) + d# 6 # ax sar \ Scale down by 64 + bx ax add \ Add to Y + + 0< if ax ax xor then \ Clip to 0 + d# 255 # ax cmp > if d# 255 # ax mov then \ Clip to 255 + + al stos \ Output B + d# 255 # al mov + al stos \ Output A + + 8 [sp] dec + 0= until + + d# 12 [sp] sp lea \ Clean stack + 0 [sp] di xchg \ Restore EDI + 4 [sp] si xchg \ Restore ESI +c;

1 0

[commit] r2110 - cpu/x86
by repository service 17 Jan '11

17 Jan '11

Author: wmb Date: Mon Jan 17 22:44:52 2011 New Revision: 2110 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2110 Log: X86 assembler - added imul-imm and imul2 for assembling alternative forms of the IMUL instruction. Trying to work out the instruction form automatically from the operands is just too hard. Modified: cpu/x86/assem.fth Modified: cpu/x86/assem.fth ============================================================================== --- cpu/x86/assem.fth Mon Jan 17 07:20:26 2011 (r2109) +++ cpu/x86/assem.fth Mon Jan 17 22:44:52 2011 (r2110) @@ -749,6 +749,25 @@ : rdmsr ( -- ) prefix-0f h# 32 asm8, ; : cpuid ( -- ) prefix-0f h# a2 asm8, ; \ Arg in %eax, results in ax,bx,dx,cx +: imul2 ( MR REG -- ) \ REG <- REG * R/M + prefix-0f h# AF asm8, r/m, +; + +: imul-imm ( imm # MR REG -- ) \ REG <- R/M * imm16/32 "500 # bx cx imul-imm" + here >r ( imm # MR r: adr ) + h# 69 asm8, ( imm # MR ) + r/m, ( imm # ) + # <> abort" Expecting # in imul-imm" ( imm ) + dup big? if ( imm r: adr ) + 16bit? if asm16, else asm32, then ( r: adr ) + r> drop ( ) + else ( imm r: adr ) + asm8, ( r: adr ) + \ Change the opcode from 69 to 6b + h# 6b r> asm8! ( ) + then +; + \ Structured Conditionals \ single pass forces fixed size. optimize for small, fast structures: \ always use 8-bit offsets.

1 0

[commit] r2109 - dev/mmc/sdhci
by repository service 17 Jan '11

17 Jan '11

Author: wmb Date: Mon Jan 17 07:20:26 2011 New Revision: 2109 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2109 Log: sdhci.fth - added definition of le-l@ for the fcode-building case. Modified: dev/mmc/sdhci/sdhci.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Fri Jan 14 01:10:40 2011 (r2108) +++ dev/mmc/sdhci/sdhci.fth Mon Jan 17 07:20:26 2011 (r2109) @@ -1141,6 +1141,12 @@ r> base ! ; +[ifndef] le-l@ +: le-l@ ( adr -- l ) + >r r@ c@ r@ 1+ c@ r@ 2+ c@ r> 3 + c@ bljoin +; +[then] + \ The calculation below is shown on page 81 of the \ SD Physical Layer Simplified Specification Version 2.00. : size ( -- d.bytes )

1 0

[commit] r2108 - cpu/arm
by repository service 14 Jan '11

14 Jan '11

Author: wmb Date: Fri Jan 14 01:10:40 2011 New Revision: 2108 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2108 Log: ARM assembler enhancements and bug fixes, thanks to Mike Tuciarone. Modified: cpu/arm/assem.fth Modified: cpu/arm/assem.fth ============================================================================== --- cpu/arm/assem.fth Sat Jan 8 11:23:43 2011 (r2107) +++ cpu/arm/assem.fth Fri Jan 14 01:10:40 2011 (r2108) @@ -548,16 +548,18 @@ : amode-rdop2 ( -- ) init-operands get-r12 get-opr2 !op ; : amode-rev ( -- ) init-operands get-r12 get-r00 !op ; -: amode-lsm ( -- ) +: amode-lsm ( need-r16? -- ) init-operands - get-r16 ( ) - adr-delim ascii ! = if ( ) - flip-w ( ) - require-field " ," ?expecting drop ( ) - then ( ) + if + get-r16 ( ) + adr-delim ascii ! = if ( ) + flip-w ( ) + require-field " ," ?expecting drop ( ) + then ( ) - \ There should be a comma on the end of the register. - adr-delim ascii , <> " ," ?expecting + \ There should be a comma on the end of the register. + adr-delim ascii , <> " ," ?expecting + then \ The next thing up should be an open brace for the register list. get-whatever adt-delimiter <> " {" ?expecting @@ -583,7 +585,6 @@ \ We've finished the register list, is there a ^ hanging on the end? ascii ^ parse-1 if flip-b then - !op ; @@ -713,6 +714,9 @@ : amode-swp ( -- ) init-operands get-r12 get-r00 ['] get-off0 get-ea !op ; +: amode-ldrex ( -- ) + init-operands get-r12 ['] get-off0 get-ea !op +; : amode-copr ( -- ) \ Co-processors: mcr, mrc \ p, #, r, c, c, # @@ -769,6 +773,9 @@ \ This word looks for [|b] on swp commands. : {b} ( -- ) ascii b parse-1 if flip-b then ; +\ This word looks for [|bh] on ld/strex commands. +: {bh} ( -- ) ascii h parse-1 if flip-b flip-w else {b} then ; + \ If the s flag is found, set bit 20 for alu commmands. : {s} ( -- ) ascii s parse-1 if 0010.0000 iop then ; @@ -913,6 +920,7 @@ : orr 0180.0000 {cond/s} amode-rrop2 ; : bic 01c0.0000 {cond/s} amode-rrop2 ; +: clz 016f.0f10 {cond/s} amode-rdop2 ; : mov 01a0.0000 {cond/s} amode-rdop2 ; : mvn 01e0.0000 {cond/s} amode-rdop2 ; @@ -944,10 +952,14 @@ : bx 012f.ff10 {cond} amode-bx ; -: swp 0100.0090 {cond} {b} amode-swp ; - -: ldm 0810.0000 {cond} 1 parse-inc amode-lsm ; -: stm 0800.0000 {cond} 0 parse-inc amode-lsm ; +: swp 0100.0090 {cond} {b} amode-swp ; +: strex 0180.0f90 {cond} {bh} amode-swp ; +: ldrex 0190.0f9f {cond} {bh} amode-ldrex ; + +: ldm 0810.0000 {cond} 1 parse-inc 1 amode-lsm ; +: popm 08bd.0000 {cond} 0 amode-lsm ; +: stm 0800.0000 {cond} 0 parse-inc 1 amode-lsm ; +: pushm 092d.0000 {cond} 0 amode-lsm ; : ldr ( -- ) 0410.0000 {cond} {shbt} ; : str ( -- ) 0400.0000 {cond} {hbt} ; @@ -959,33 +971,42 @@ : rd-field ( reg# -- ) d# 12 set-field ; : rb-field ( reg# -- ) d# 16 set-field ; -\ XXX need ADR, SET \ adr{cond} rN,<address> +\ set{cond} rN,<imm> +: asm-const ( const adr? -- op ) + ea00.0000 asm, \ b here+8 + if here asm-set-relocation-bit drop then + asm, \ const + 051f.000c \ ldr rN,[pc,#-12] +; : (set) ( address? -- ) >r 0000.0000 {cond} init-operands \ Put the register number on the return stack so it won't interfere \ with the stack items used by any "*" operands there may be. get-register >r ( r: adr? reg# ) - get-immediate ( address r: adr? reg# ) - dup here >offset ( address offset r: adr? reg# ) - dup fits? if ( address offset r: adr? reg# ) - nip nip 028f.0000 ( op r: adr? reg# ) \ add rN,pc,#<offset> - else ( address offset r: adr? reg# ) - negate fits? if ( address r: adr? reg# ) - drop 024f.0000 ( op r: adr? reg# ) \ sub rN,pc,#<offset> - else ( address r: adr? reg# ) - ea00.0000 asm, ( address r: adr? reg# ) \ b here+8 - r> r@ swap >r if ( address r: adr? reg# ) - here asm-set-relocation-bit drop + get-immediate r> r> rot ( reg# adr? addr|imm ) + 2dup swap if ( reg# adr? addr|imm addr|imm ) + here >offset ( reg# adr? addr|imm offset|imm ) + then + dup fits? if ( reg# adr? addr|imm offset|imm ) + 2drop if + 028f.0000 ( reg# op ) \ add rN,pc,#<offset> + else + 03a0.0000 ( reg# op ) \ mov rN,#<imm> + then + else ( reg# adr? addr|imm offset|imm ) + rot if ( reg# addr offset ) + negate fits? if ( reg# addr ) + drop 024f.0000 ( reg# op ) \ sub rN,pc,#<offset> + else ( reg# addr ) + true asm-const ( reg# op ) then - asm, ( r: adr? reg# ) \ adr - 051f.000c ( op r: adr? reg# ) \ ldr rN,[pc,#-12] - then ( op r: adr? reg# ) - then ( op r: adr? reg# ) - iop r> rd-field ( ) - r> drop - !op + else ( reg# imm imm ) + drop false asm-const ( reg# op ) + then ( reg# op ) + then ( reg# op ) + iop rd-field !op ; : adr ( -- ) true (set) ; : set ( -- ) false (set) ; @@ -1000,6 +1021,9 @@ : sev ( -- ) h# 0320f004 {cond} !op ; : nop ( -- ) h# e1a00000 asm, ; \ mov r0,r0 +: dsb ( -- ) h# f57ff040 asm, ; +: dmb ( -- ) h# f57ff050 asm, ; +: isb ( -- ) h# f57ff060 asm, ; : # ( -- adt-immed ) adt-immed ; : reg ( -- adt-reg ) adt-reg ;

1 0

Changing default graphics port on a Powermac g4 quicksilver
by Super Bisquit 12 Jan '11

12 Jan '11

My machine does not have the diagnostics installed. How do I change the default from agp to one of the pci slots?

1 0

[commit] r2107 - cpu/arm/olpc/1.75
by repository service 08 Jan '11

08 Jan '11

Author: wmb Date: Sat Jan 8 11:23:43 2011 New Revision: 2107 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2107 Log: Q4A10d Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sat Jan 8 11:16:58 2011 (r2106) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Jan 8 11:23:43 2011 (r2107) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 10 +macro: FW_MINOR 10d

1 0

[commit] r2106 - cpu/arm/olpc/1.75
by repository service 08 Jan '11

08 Jan '11

Author: wmb Date: Sat Jan 8 11:16:58 2011 New Revision: 2106 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2106 Log: OLPC XO-1.75 A2 - Made compass driver work and tweaked on accelerometer driver. Modified: cpu/arm/olpc/1.75/compass.fth Modified: cpu/arm/olpc/1.75/compass.fth ============================================================================== --- cpu/arm/olpc/1.75/compass.fth Sat Jan 8 11:15:54 2011 (r2105) +++ cpu/arm/olpc/1.75/compass.fth Sat Jan 8 11:16:58 2011 (r2106) @@ -5,6 +5,7 @@ 4 to smb-clock-gpio# 5 to smb-data-gpio# h# 3c to smb-slave + 5 smb-data-gpio# gpio-dir-out ; : smb-init ( -- ) set-compass-slave smb-on smb-pulses ; @@ -12,31 +13,48 @@ : compass! ( byte reg# -- ) set-compass-slave smb-byte! ; : open ( -- okay? ) 0 0 ['] compass! catch if false exit then - h# a compass@ [char] H <> + h# a compass@ [char] H = if + 0 2 compass! \ Continuous conversion mode + true + else + false + then ; : close ( -- ) + 2 2 compass! \ Idle mode +; +: dir@ ( reg# -- n ) + dup compass@ swap 1+ compass@ swap bwjoin wextend +; +: direction@ ( -- x y z ) + begin 9 compass@ 1 and until + 3 dir@ 5 dir@ 7 dir@ ( x y z ) ; -\ XXX need some words to take compass readings - end-package 0 0 " " " /" begin-package " combo-accelerometer" name -: set-sensor-slave ( -- ) h# 30 6 set-twsi-target ; -: sensor@ ( reg# -- byte ) set-sensor-slave twsi-b@ ; -: sensor! ( byte reg# -- ) set-sensor-slave twsi-b@ ; +\ : set-sensor-slave ( -- ) h# 30 6 set-twsi-target ; +: set-sensor-slave ( -- ) + 4 to smb-clock-gpio# + 5 to smb-data-gpio# + h# 30 to smb-slave + 5 smb-data-gpio# gpio-dir-out +; + +: sensor@ ( reg# -- byte ) set-sensor-slave smb-byte@ ; +: sensor! ( byte reg# -- ) set-sensor-slave smb-byte@ ; : accelerometer-on ( -- ) h# 27 h# 20 sensor! ; : accelerometer-off ( -- ) h# 07 h# 20 sensor! ; -: wext ( w -- l ) dup h# 8000 and if h# ffff0000 or then ; : acceleration@ ( -- x y z ) set-sensor-slave - h# 28 1 6 twsi-get ( xl xh yl yh zl zh ) + 6 h# 28 smb-read-n ( xl xh yl yh zl zh ) 2>r 2>r ( xl xh ) - bwjoin wext ( x r: zl,zh yl,yh ) - 2r> bwjoin wext ( x y r: zl,zh ) - 2r> bwjoin wext ( x y z ) + bwjoin wextend ( x r: zl,zh yl,yh ) + 2r> bwjoin wextend ( x y r: zl,zh ) + 2r> bwjoin wextend ( x y z ) ; : open ( -- okay? )

1 0

[commit] r2105 - cpu/arm/olpc/1.75
by repository service 08 Jan '11

08 Jan '11

Author: wmb Date: Sat Jan 8 11:15:54 2011 New Revision: 2105 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2105 Log: OLPC XO-1.75 A2 - Added support for switching between internal MicroSD and eMMC. Added: cpu/arm/olpc/1.75/emmc.fth Modified: cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Sat Jan 8 11:12:51 2011 (r2104) +++ cpu/arm/olpc/1.75/devices.fth Sat Jan 8 11:15:54 2011 (r2105) @@ -223,6 +223,9 @@ ' 15x30pc to romfont fload ${BP}/cpu/arm/olpc/1.75/sdhci.fth +[ifndef] cl2-a1 +fload ${BP}/cpu/arm/olpc/1.75/emmc.fth +[then] devalias int /sd/disk@3 devalias ext /sd/disk@1 @@ -319,9 +322,11 @@ ec-api-ver@ " ec-version" integer-property [then] +[ifndef] cl2-a2 \ XXX remove this ifndef when the new EC code is ready ['] ec-name$ catch 0= if " ec-name" string-property then ['] ec-date$ catch 0= if " ec-date" string-property then ['] ec-user$ catch 0= if " ec-user" string-property then +[then] dend " /openprom" find-device Added: cpu/arm/olpc/1.75/emmc.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/emmc.fth Sat Jan 8 11:15:54 2011 (r2105) @@ -0,0 +1,55 @@ +\ XXX do we need to set the internal SD for fast drive in boardgpio.fth ? +: select-internal-sd ( -- ) + ." Using internal SD" cr + h# d8c3 d# 113 af! \ SD_CMD + h# d8c3 d# 126 af! \ SD_DATA2 + h# d8c3 d# 127 af! \ SD_DATA0 + h# d8c3 d# 130 af! \ SD_DATA3 + h# d8c3 d# 135 af! \ SD_DATA1 + h# d8c3 d# 138 af! \ SD_CLK + h# c1 d# 111 af! \ eMMC_D0 as GPIO + h# c1 d# 112 af! \ eMMC_CMD as GPIO + h# c1 d# 151 af! \ eMMC_CLK as GPIO + h# c1 d# 162 af! \ eMMC_D6 as GPIO + h# c1 d# 163 af! \ eMMC_D4 as GPIO + h# c1 d# 164 af! \ eMMC_D2 as GPIO + h# c1 d# 165 af! \ eMMC_D7 as GPIO + h# c1 d# 166 af! \ eMMC_D5 as GPIO + h# c1 d# 167 af! \ eMMC_D3 as GPIO + h# c1 d# 168 af! \ eMMC_D1 as GPIO +; +: select-emmc ( -- ) + ." Using eMMC" cr + h# c1 d# 113 af! \ SD_CMD as GPIO + h# c1 d# 126 af! \ SD_DATA2 as GPIO + h# c0 d# 127 af! \ SD_DATA0 as GPIO + h# c0 d# 130 af! \ SD_DATA3 as GPIO + h# c0 d# 135 af! \ SD_DATA1 as GPIO + h# c0 d# 138 af! \ SD_CLK as GPIO + + \ XXX perhaps 18c2 for fast? + h# c2 d# 111 af! \ eMMC_D0 + h# c2 d# 112 af! \ eMMC_CMD + h# c2 d# 151 af! \ eMMC_CLK + h# c2 d# 162 af! \ eMMC_D6 + h# c2 d# 163 af! \ eMMC_D4 + h# c2 d# 164 af! \ eMMC_D2 + h# c2 d# 165 af! \ eMMC_D7 + h# c2 d# 166 af! \ eMMC_D5 + h# c2 d# 167 af! \ eMMC_D3 + h# c2 d# 168 af! \ eMMC_D1 + + d# 149 gpio-set \ Release eMMC_RST# + + d# 34 gpio-set \ This is for the case where the eMMC power is rewired to the WLAN +; +\ Says COMM - is RST# +\ Says RESET - is CMD + +stand-init: + d# 56 gpio-pin@ if + select-emmc + else + select-internal-sd + then +;

1 0

[commit] r2104 - cpu/arm/olpc/1.75
by repository service 08 Jan '11

08 Jan '11

Author: wmb Date: Sat Jan 8 11:12:51 2011 New Revision: 2104 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2104 Log: OLPC XO-1.75 A2 - fixed some errors in the pin muxing for A2. Modified: cpu/arm/olpc/1.75/boardgpio.fth Modified: cpu/arm/olpc/1.75/boardgpio.fth ============================================================================== --- cpu/arm/olpc/1.75/boardgpio.fth Sat Jan 8 11:11:59 2011 (r2103) +++ cpu/arm/olpc/1.75/boardgpio.fth Sat Jan 8 11:12:51 2011 (r2104) @@ -5,6 +5,7 @@ d# 01 gpio-dir-out \ EN_USB_PWR d# 04 gpio-dir-out \ COMPASS_SCL + d# 05 gpio-dir-out \ COMPASS_SDA d# 08 gpio-dir-out \ AUDIO_RESET# d# 10 gpio-dir-out \ LED_STORAGE d# 11 gpio-dir-out \ VID2 @@ -16,10 +17,10 @@ d# 58 gpio-set \ WLAN_RESET# d# 58 gpio-dir-out \ WLAN_RESET# d# 73 gpio-dir-out \ CAM_RST - d# 97 gpio-dir-out \ RTC_SCK - d# 98 gpio-dir-out \ RTC_SDA [ifdef] cl2-a1 + d# 97 gpio-dir-out \ RTC_SCK + d# 98 gpio-dir-out \ RTC_SDA [else] d# 53 gpio-set \ RTC_SCK d# 53 gpio-dir-out \ RTC_SCK @@ -313,10 +314,10 @@ 2 af, \ GPIO_162 - eMMC_D6 2 af, \ GPIO_163 - eMMC_D4 2 af, \ GPIO_164 - eMMC_D2 - 1 af, \ GPIO_165 - eMMC_D7 - 1 af, \ GPIO_166 - eMMC_D5 - 1 af, \ GPIO_167 - eMMC_D3 - 1 af, \ GPIO_168 - eMMC_D1 + 2 af, \ GPIO_165 - eMMC_D7 + 2 af, \ GPIO_166 - eMMC_D5 + 2 af, \ GPIO_167 - eMMC_D3 + 2 af, \ GPIO_168 - eMMC_D1 [then] : init-mfprs

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware