OpenBIOS November 2012

openbios@openbios.org

6 participants
31 discussions

by Programmingkid

This patch is a replacement for the last spin patch. The spin word has been moved to another file because of compilation issues. The spin word is set by bootx when Mac OS X is booting. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: trunk/openbios-devel/forth/system/main.fs =================================================================== --- trunk/openbios-devel/forth/system/main.fs (revision 1067) +++ trunk/openbios-devel/forth/system/main.fs (working copy) @@ -58,3 +58,6 @@ outer-interpreter ; + +\ Set by Bootx when booting Mac OS X +defer spin \ No newline at end of file

8 years, 10 months

[PATCH] have switch-arch tell you compiler name

by Programmingkid

This patch adds a feature to switch-arch so it tells you the names of the compilers is it looking for. I had just installed a cross compiler and was confused as to why switch-arch wouldn't detect it. This feature helped me figure out that the problem was with the name of the compiler I was using. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: /Users/misbah/Desktop/openbios/trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- /Users/misbah/Desktop/openbios/trunk/openbios-devel/config/scripts/switch-arch (revision 1067) +++ /Users/misbah/Desktop/openbios/trunk/openbios-devel/config/scripts/switch-arch (working copy) @@ -99,6 +99,7 @@ { for TARGET in ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- do + echo "Trying compiler ${TARGET}gcc" if type ${TARGET}gcc > /dev/null 2>&1 then return

8 years, 10 months

[PATCH] adds spin word to dictionary

by Programmingkid

This patch adds the word 'spin' to the dictionary. It is defer instance that is set by Bootx while booting Mac OS X. I kept it in the ppc.fs file because this file is only used on PowerPC targets. Index: trunk/openbios-devel/arch/ppc/ppc.fs =================================================================== --- trunk/openbios-devel/arch/ppc/ppc.fs (revision 1067) +++ trunk/openbios-devel/arch/ppc/ppc.fs (working copy) @@ -45,3 +45,6 @@ 0 value %sprg1 0 value %sprg2 0 value %sprg3 + +\ Set by BootX to boot Mac OS X +defer spin \ No newline at end of file

8 years, 10 months

About the local variable patch

by Programmingkid

I ran Mark's local variable patch thru all these test and it past. : myword { ; dog cat } 4 -> dog 33 -> cat cr ." dog = " dog . cr ." cat = " cat . ; 4 : myword2 { hamster } cr ." hamster = " hamster . ; 8 : myword3 { car ; truck } 5 -> truck cr ." truck = " truck . cr ." car = " car . ; 9 10 : myword4 { bevus butthead ; homer } cr ." bevus = " bevus . 3 -> homer cr ." homer = " homer . cr ." butthead = " butthead . ; 100 1 do I I 1 + myword4 loop : myword6 { ; bart } 19 -> bart cr ." bart in myword6 = " bart . ; : myword5 { ; bart } 10 -> bart myword6 cr ." bart in myword5 = " bart . ; Good job :)

8 years, 10 months

[PATCH 1/2] Implementation of Forth local variables for OpenBIOS.

by Mark Cave-Ayland

Some bootloaders, particularly OS X, execute Forth strings that make use of Forth local variables. This patch provides an implementation that allows OpenBIOS to execute such code. A couple of examples are included below: : diff.squares { A B -- A*A-B*B } A A * B B * - ; : myword { ; cat dog } 4 -> cat 5 -> dog cat \ cat's value pushed onto stack ( - cat) dog \ dog's value pushed onto stack (cat - cat dog ) + cr ." Total animals = " . cr ; Since the Forth locals stack and temporary dictionary take up extra space, the locals implementation is protected by a new CONFIG_LOCALS build variable. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/forth/bootstrap/bootstrap.fs | 13 ++ openbios-devel/forth/lib/build.xml | 1 + openbios-devel/forth/lib/locals.fs | 197 +++++++++++++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 openbios-devel/forth/lib/locals.fs diff --git a/openbios-devel/forth/bootstrap/bootstrap.fs b/openbios-devel/forth/bootstrap/bootstrap.fs index 08683f0..f295e4e 100644 --- a/openbios-devel/forth/bootstrap/bootstrap.fs +++ b/openbios-devel/forth/bootstrap/bootstrap.fs @@ -49,6 +49,10 @@ variable #order 0 #order ! defer context 0 value vocabularies? +defer locals-end +0 value locals-dict +variable locals-dict-buf + \ \ 7.3.7 Flag constants \ @@ -925,6 +929,11 @@ variable #out 0 #out ! ; : $find ( name-str name-len -- xt true | name-str name-len false ) + locals-dict 0<> if + locals-dict-buf @ find-wordlist ?dup if + exit + then + then vocabularies? if #order @ 0 ?do i cells context + @ @@ -1426,6 +1435,10 @@ false value capital-hex? ; : ; + locals-dict 0<> if + 0 ['] locals-dict /n + ! + ['] locals-end , + then ['] (semis) , reveal ['] [ execute ; immediate diff --git a/openbios-devel/forth/lib/build.xml b/openbios-devel/forth/lib/build.xml index 8c353ff..34eee40 100644 --- a/openbios-devel/forth/lib/build.xml +++ b/openbios-devel/forth/lib/build.xml @@ -16,6 +16,7 @@ <object source="split.fs"/> <object source="lists.fs"/> <object source="64bit.fs"/> + <object source="locals.fs"/> </dictionary> </build> diff --git a/openbios-devel/forth/lib/locals.fs b/openbios-devel/forth/lib/locals.fs new file mode 100644 index 0000000..e697383 --- /dev/null +++ b/openbios-devel/forth/lib/locals.fs @@ -0,0 +1,197 @@ +\ tag: local variables +\ +\ Copyright (C) 2012 Mark Cave-Ayland +\ +\ See the file "COPYING" for further information about +\ the copyright and warranty status of this work. +\ + +[IFDEF] CONFIG_LOCALS + +\ Init local variable stack +variable locals-var-stack +here 200 cells allot locals-var-stack ! + +\ Set initial stack pointer +\ +\ Stack looks like this: +\ ... (sp n-2) local1 ... localm-1 localm (sp n-1) <-- sp + +locals-var-stack @ value locals-var-sp +locals-var-sp locals-var-stack @ ! + +0 value locals-var-count +0 value locals-flags + +here 200 cells allot locals-dict-buf ! + +8 constant #locals + +: (local1) locals-var-sp @ /n + ; +: (local2) locals-var-sp @ 2 cells + ; +: (local3) locals-var-sp @ 3 cells + ; +: (local4) locals-var-sp @ 4 cells + ; +: (local5) locals-var-sp @ 5 cells + ; +: (local6) locals-var-sp @ 6 cells + ; +: (local7) locals-var-sp @ 7 cells + ; +: (local8) locals-var-sp @ 8 cells + ; + +: local1@ (local1) @ ; +: local2@ (local2) @ ; +: local3@ (local3) @ ; +: local4@ (local4) @ ; +: local5@ (local5) @ ; +: local6@ (local6) @ ; +: local7@ (local7) @ ; +: local8@ (local8) @ ; + +: local1! (local1) ! ; +: local2! (local2) ! ; +: local3! (local3) ! ; +: local4! (local4) ! ; +: local5! (local5) ! ; +: local6! (local6) ! ; +: local7! (local7) ! ; +: local8! (local8) ! ; + +create locals-read-table +['] local1@ , +['] local2@ , +['] local3@ , +['] local4@ , +['] local5@ , +['] local6@ , +['] local7@ , +['] local8@ , + +create locals-write-table +['] local1! , +['] local2! , +['] local3! , +['] local4! , +['] local5! , +['] local6! , +['] local7! , +['] local8! , + + +: locals-push ( n -- ) + locals-var-sp /n + to locals-var-sp + locals-var-sp ! +; + +: locals-0-push ( -- ) + 0 locals-push +; + +: (apply-local-flags) ( lfa -- ) + 1 - dup c@ locals-flags or swap c! +; + +: locals-no-pop? ( lfa -- ? ) + 1 - c@ 8 and 0<> +; + +: locals-drop \ Destroy current stack frame + locals-var-sp @ to locals-var-sp +; + +['] locals-drop to locals-end + +: (local-init) ( str len -- ) + header 1 , \ DOCOL + ['] (lit) , ['] noop , \ read-xt + ['] (lit) , ['] noop , \ write-xt + ['] 2drop , \ do nothing + ['] (lit) , + here 5 cells - , + ['] @ , ['] , , \ store read-xt + ['] (semis) , + reveal + immediate + last @ (apply-local-flags) +; + +: (local-noop) ( str len -- ) + 2drop +; + +\ Word called when consuming a local variable +defer (local) + +: } ( C: current latest here -- ) + here! latest ! current ! \ Switch back to normal dict + locals-dict-buf @ to locals-dict \ Make locals-dict visible to $find + 0 to locals-var-count + ['] locals-var-sp , \ save previous sp on rstack + ['] >r , + locals-dict @ \ ( last -- ) + begin + ?dup 0<> + while + >r + locals-var-count /n * + locals-read-table + @ r@ 3 cells + ! \ set read-xt + locals-var-count /n * + locals-write-table + @ r@ 5 cells + ! \ set write-xt + locals-var-count 1+ to locals-var-count + r@ locals-no-pop? if + ['] locals-0-push , \ initialise with 0 + else + ['] locals-push , \ initialise from stack + then + r> @ \ next lfa + repeat + ['] r> , + ['] locals-push , \ write previous sp +; immediate + +: { ( C: -- current latest here ) + current @ latest @ here + ['] (local-init) to (local) + 0 to locals-flags + 0 to locals-var-count + locals-dict-buf @ 200 cells 0 fill \ Zero out temporary dictionary + locals-dict-buf @ current ! \ Switch to locals dictionary + locals-dict-buf @ /n + here! + + begin + parse-word + 2dup s" }" strcmp 0= if + 2drop + ['] } execute -1 + else + 2dup s" ;" strcmp 0= if + 2drop + 8 to locals-flags 0 \ Don't init from stack + else + 2dup s" |" strcmp 0= if + 2drop + 8 to locals-flags 0 \ Don't init from stack + else + 2dup s" --" strcmp 0= if + 2drop + ['] (local-noop) to (local) 0 + else + locals-var-count #locals < if + (local) 0 \ accept local + else + s" maximum locals used ignoring " type type cr 0 + then + locals-var-count 1+ to locals-var-count + then + then + then + then + until +; immediate + +: -> ( n -- ) + parse-word $find if + 4 cells + @ , + else + s" unable to find word " type type + then +; immediate + +[THEN] -- 1.7.10.4

8 years, 10 months

[PATCH] Adds the get-key-map word to the keyboard node.

by Programmingkid

The get-key-map word is used by Bootx to determine which key is being held down at startup time. Since the Command key can't be detected in QEMU, the Control key is used instead. If the user holds down Control-v while Mac OS X starts up in QEMU, get-key-map will report that Command-v is being held down. Allowing the user to have Mac OS X to boot up in Verbose mode. I was able to verify that this word works when I tested it out in the file forth.c, but I don't know how to access this word here in the adb_kbd.c file. Comments, suggestions, and commits are always welcomed. --- drivers/adb_kbd.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 77 insertions(+), 3 deletions(-) diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c index e38798a..82382d5 100644 --- a/drivers/adb_kbd.c +++ b/drivers/adb_kbd.c @@ -42,11 +42,13 @@ keyboard_close(int *idx) } static void keyboard_read(void); +void getKeyMap(void); NODE_METHODS( keyboard ) = { - { "open", keyboard_open }, - { "close", keyboard_close }, - { "read", keyboard_read }, + { "open", keyboard_open }, + { "close", keyboard_close }, + { "read", keyboard_read }, + { "get-key-map", getKeyMap }, }; /* VT100 escape sequences */ @@ -566,3 +568,75 @@ static void keyboard_read(void) } PUSH(i); } + + +// Returns the base to the exponent power +static int pow(int base, int exponent) +{ + int index, answer; + answer = base; + for(index = 1; index < exponent; index++) + { + answer = answer * base; + } + return answer; +} + +// The implementation of the get-key-map word. +// Returns an array of 32 bytes. Certain bits +// are used to determine which keys are being +// held down. + +void getKeyMap(void) +{ + int keyPushed, *keyMapArray, offset; + const int sizeOfArray = 8; + const int modifierKeyIndex = 7; + const int commandKeyValue = pow(2,28); + const int shiftKeyValue = pow(2,30); + const int theAKeyValue = pow(2,27); + + keyMapArray = (char *) malloc(sizeOfArray); + if(!keyMapArray) + { + printk("Failed to allocate memory for keyMapArray!\n"); + PUSH(NULL); + return; + } + + // Set all the elements to zero + int index; + for(index = 0; index < sizeOfArray; index++) + { + keyMapArray[index] = 0; + } + + feval("key?"); + if(POP() != -1) // if no key was pushed + PUSH(keyMapArray); // returns the address of keyMapArray + + feval("key"); + keyPushed = POP(); + + if(keyPushed > 0 && keyPushed < 27) // control key combination + { + offset = 1; + keyMapArray[modifierKeyIndex] = commandKeyValue; + } + + else if(keyPushed > 64 && keyPushed < 91) // shift key combination + { + offset = 65; + keyMapArray[modifierKeyIndex] = shiftKeyValue; + } + + else // just a letter is being held down + { + offset = 97; + } + + // Determines the value and location of a bit in the array. + *keyMapArray = theAKeyValue >> (keyPushed - offset); + + PUSH(keyMapArray); +} \ No newline at end of file -- 1.7.5.4

8 years, 10 months

Forgot the signed-of-by line

by Programmingkid

signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- drivers/adb_kbd.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 77 insertions(+), 3 deletions(-) diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c index e38798a..82382d5 100644 --- a/drivers/adb_kbd.c +++ b/drivers/adb_kbd.c @@ -42,11 +42,13 @@ keyboard_close(int *idx) } static void keyboard_read(void); +void getKeyMap(void); NODE_METHODS( keyboard ) = { - { "open", keyboard_open }, - { "close", keyboard_close }, - { "read", keyboard_read }, + { "open", keyboard_open }, + { "close", keyboard_close }, + { "read", keyboard_read }, + { "get-key-map", getKeyMap }, }; /* VT100 escape sequences */ @@ -566,3 +568,75 @@ static void keyboard_read(void) } PUSH(i); } + + +// Returns the base to the exponent power +static int pow(int base, int exponent) +{ + int index, answer; + answer = base; + for(index = 1; index < exponent; index++) + { + answer = answer * base; + } + return answer; +} + +// The implementation of the get-key-map word. +// Returns an array of 32 bytes. Certain bits +// are used to determine which keys are being +// held down. + +void getKeyMap(void) +{ + int keyPushed, *keyMapArray, offset; + const int sizeOfArray = 8; + const int modifierKeyIndex = 7; + const int commandKeyValue = pow(2,28); + const int shiftKeyValue = pow(2,30); + const int theAKeyValue = pow(2,27); + + keyMapArray = (char *) malloc(sizeOfArray); + if(!keyMapArray) + { + printk("Failed to allocate memory for keyMapArray!\n"); + PUSH(NULL); + return; + } + + // Set all the elements to zero + int index; + for(index = 0; index < sizeOfArray; index++) + { + keyMapArray[index] = 0; + } + + feval("key?"); + if(POP() != -1) // if no key was pushed + PUSH(keyMapArray); // returns the address of keyMapArray + + feval("key"); + keyPushed = POP(); + + if(keyPushed > 0 && keyPushed < 27) // control key combination + { + offset = 1; + keyMapArray[modifierKeyIndex] = commandKeyValue; + } + + else if(keyPushed > 64 && keyPushed < 91) // shift key combination + { + offset = 65; + keyMapArray[modifierKeyIndex] = shiftKeyValue; + } + + else // just a letter is being held down + { + offset = 97; + } + + // Determines the value and location of a bit in the array. + *keyMapArray = theAKeyValue >> (keyPushed - offset); + + PUSH(keyMapArray); +} \ No newline at end of file -- 1.7.5.4

8 years, 10 months

About the keyboard device

by Programmingkid

Can a keyboard node word be accessed in OpenBIOS? If so, how?

8 years, 10 months

Adding to the device tree

by Programmingkid

How would I add a device to the device tree, and be able to open that device using open-dev? I am trying to add "/pseudo-hid/keyboard" to the device tree. I need to test out a new keyboard word that I am adding.

8 years, 10 months

[PATCH] Adds spin to dictionary. Needed by bootx to boot Mac OS X.

by Programmingkid

This patch adds the spin word to the dictionary. It is used by bootx during startup to boot Mac OS X. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/ppc.fs | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/ppc/ppc.fs b/arch/ppc/ppc.fs index ae1f640..830b61a 100644 --- a/arch/ppc/ppc.fs +++ b/arch/ppc/ppc.fs @@ -45,3 +45,7 @@ 0 value %sprg1 0 value %sprg2 0 value %sprg3 + + +\ Set by bootx during startup +defer spin -- 1.7.5.4

8 years, 10 months