OpenBIOS October 2012

openbios@openbios.org

6 participants
18 discussions

by Programmingkid

The following code is for the use of local variables in OpenBIOS. I was able to successfully make a word that used local variables. The work isn't complete. There is still work to be done with the INTERPRET word. The LFIND word has be implemented in the INTERPRET word for local variables to be recognized during the compile state. I just need a C-like CONTINUE word to go back to the start of a loop to fix all my problems with INTERPRET. Maybe someone knows a better way of adding LFIND to INTERPRET. I would appreciate any comments, suggestions, or advice for the following code. \ Creates an array variable : ARRAY ( cellCount - ) DEPTH 0= IF CR ." Please specify an array size." CR EXIT THEN \ Compile-time behavior CREATE CELL * ALLOT \ creates and initializes the instance DOES> \ Run-time behavior DEPTH 2 < IF CR ." Please specify an index number." CR drop \ removes the address of the array instance -1 throw \ stop normal execution after error THEN SWAP CELL * + \ Calculates address to return ; immediate \ Declare the local-base-address VALUE 0 VALUE local-base-address \ returns the base address used for the local words : getBaseAddress ( - addr ) local-base-address ; \ sets the base address used for the local words : setBaseAddress ( addr - ) TO local-base-address ; \ Sets the first local variable's value : Local0! ( x - ) 0 CELL * getBaseAddress + ! ; \ Sets the second local variable's value : Local1! ( x - ) 1 CELL * getBaseAddress + ! ; \ Sets the third local variable's value : Local2! ( x - ) 2 CELL * getBaseAddress + ! ; \ Sets the fourth local variable's value : Local3! ( x - ) 3 CELL * getBaseAddress + ! ; \ Sets the fifth local variable's value : Local4! ( x - ) 4 CELL * getBaseAddress + ! ; \ Sets the sixth local variable's value : Local5! ( x - ) 5 CELL * getBaseAddress + ! ; \ Sets the seventh local variable's value : Local6! ( x - ) 6 CELL * getBaseAddress + ! ; \ Sets the eighth local variable's value : Local7! ( x - ) 7 CELL * getBaseAddress + ! ; \ Sets the ninth local variable's value : Local8! ( x - ) 8 CELL * getBaseAddress + ! ; \ Sets the tenth local variable's value : Local9! ( x - ) 9 CELL * getBaseAddress + ! ; \ Sets the eleventh local variable's value : Local10! ( x - ) 10 CELL * getBaseAddress + ! ; \ Sets the twelfth local variable's value : Local11! ( x - ) 11 CELL * getBaseAddress + ! ; \ **** Calculates the needed amount of memory for local variables **** 0 value variableCount : calculateNeededMemory ( "char" - n ) 0 TO variableCount >in @ \ keep track of where the pointer was begin parse-word 0= if \ if there is no more text to parse drop true else dup " ;" comp 0= if \ if the semicolon is encountered drop \ drop the duplicated address false else " }" comp 0= if \ if '}' character is encountered true \ end loop because '}' marks end of local variables else variableCount 1 + TO variableCount false then then then until >in ! \ reset the pointer variableCount CELL * ; \ **** allocates the memory for local variables **** : allocateMemory ( n - addr ) alloc-mem dup 0= if drop cr cr 10 spaces abort" Failed to allocate memory for local variables!" cr cr then ; \ Declares the size of the local variable table 48 CONSTANT localTableSize \ Declare the local variable table localTableSize ARRAY localVariableTable \ Keeps track of end of array 0 VALUE arrayCount \ gets the number of records in the local variable table : getLocalRecordCount arrayCount 4 / ; \ Clears the local variable table : initLocalTable ( - ) \ free all the dynamically allocated memory arrayCount 0 ?do I 3 + localVariableTable @ ( addr ) free-mem ( ) 4 +loop 0 localVariableTable localTableSize erase 0 TO arrayCount ; \ Adds a local variable symbol to the local variable table : addLocal ( addr len order initflag - ) depth 4 < if cr ." The stack needs at least 4 values to add a local variable." cr exit then \ add to the table arrayCount 0 + localVariableTable ! \ initflag arrayCount 1 + localVariableTable ! \ order arrayCount 2 + localVariableTable ! \ len arrayCount 3 + localVariableTable ! \ addr \ allocate memory for the symbol arrayCount 2 + localVariableTable @ ( length ) alloc-mem ( memaddr ) dup ( memaddr memaddr ) dup ( memaddr memaddr memaddr ) \ called only when memaddr = 0 0= ( memaddr memaddr flag ) if cr ." Failed to allocate memory in addLocal!" cr ( memaddr memaddr ) then \ copy local variable name to a safe location arrayCount 3 + localVariableTable @ ( memaddr memaddr addr ) swap ( memaddr addr memaddr ) arrayCount 2 + localVariableTable @ ( memaddr addr memaddr length ) move ( memaddr ) arrayCount 3 + localVariableTable ! ( ) \ increment arrayCount arrayCount 4 + TO arrayCount ; \ prints the local variable table : printLocalTable arrayCount 0= if cr ." No variables loaded" cr exit then arrayCount 0 ?do cr ." Variable name: " I 3 + localVariableTable @ I 2 + localVariableTable @ type ." Order: " I 1 + localVariableTable @ . ." Init Flag: " I 0 + localVariableTable @ . 4 +loop ; \ Finds a local variable symbol in the local variable table \ Returns its order or -1 on failure : getOrder ( addr len - order ) \ if the address and length are missing depth 2 < if cr ." Address and length are required on the stack to use getOrder!" cr -1 throw \ ends execution then arrayCount 0 ?do over ( addr len addr ) I 3 + ( addr len addr addrindex ) localVariableTable @ ( addr len addr addr1 ) 2 pick ( addr len addr addr1 len ) comp ( addr len n ) 0= ( addr len flag ) if \ if the symbol is found 2drop ( addr len - ) I 1 + localVariableTable @ unloop exit then 4 \ increment the index by 4 +loop 2drop ( addr len - ) -1 \ returns -1 for the order if the symbol is not found ; \ **** read the local variables in the input stream **** 0 VALUE useTopStackValue 0 VALUE index 0 VALUE localVariableMemory : readLocalVariables ( "char" - ) 0 TO index true TO useTopStackValue begin parse-word ( addr len ) dup ( addr len len ) 0> ( addr len flag ) while ( addr len ) 2dup ( addr len addr len ) drop ( addr len addr ) " }" ( addr len addr addr len ) comp ( addr len flag ) 0= ( addr len flag ) if ( addr len ) \ if end of local variables drop ( addr ) drop ( ) exit ( ) then 2dup ( addr len addr len ) drop ( addr len addr ) " ;" ( addr len addr addr len ) comp ( addr len flag ) 0= ( addr len flag ) if ( addr len ) \ if not using top stack value for local variables false TO useTopStackValue ( addr len ) else \ add local variable to table index useTopStackValue ( addr len order useTopStackValue ) addLocal ( ) index 1 + TO index \ increment index then repeat drop ( addr ) drop ( ) ; \ FALSE VALUE usingLocals \ not needed because it is in the interpreter.fs file \ declare the local stack 1000 ARRAY localStack \ declare the stack top pointer 0 VALUE localStackTop \ Adds to the top of the local stack : pushLocalStack ( x - L:x ) localStackTop localStack ! ( x - ) localStackTop 1 + TO localStackTop ; \ Removes the top local stack value and places it into the data stack : popLocalStack ( L:x - x ) localStackTop localStack @ localStackTop 1 - TO localStackTop ; 12 CONSTANT localVariableLimit \ ***** sets up local variables ****** : { ( "char" - ) initLocalTable \ localVariableLimit CELL * ( memorySize ) calculateNeededMemory ( memorySize ) allocateMemory ( memorySize - addr ) TO localVariableMemory ( ) readLocalVariables ( ) TRUE TO usingLocals \ add code to the current definition \ saves the old base address postpone getBaseAddress postpone pushLocalStack \ sets the base address to this definition's reserved memory localVariableMemory postpone literal postpone setBaseAddress \ add code to initialize the variables if needed arrayCount 0 ?do I 0 + localVariableTable @ ( flag ) \ get the init flag true ( flag true ) = ( flag1 ) if I 4 / ( variable number ) case 0 of ['] Local0! , endof 1 of ['] Local1! , endof 2 of ['] Local2! , endof 3 of ['] Local3! , endof 4 of ['] Local4! , endof 5 of ['] Local5! , endof 6 of ['] Local6! , endof 7 of ['] Local7! , endof 8 of ['] Local8! , endof 9 of ['] Local9! , endof 10 of ['] Local10! , endof 11 of ['] Local11! , endof cr ." Can't save to local variable! " cr exit endcase then 4 +loop ; immediate \ declares this word as a compiler directive \ sets values for local variables : -> ( - ) parse-word ( addr len ) getOrder ( order ) dup ( order order ) -1 = ( order flag ) if \ if the symbol isn't found cr ." Symbol is not a local variable! " cr drop ( ) exit then case 0 of ['] Local0! , endof 1 of ['] Local1! , endof 2 of ['] Local2! , endof 3 of ['] Local3! , endof 4 of ['] Local4! , endof 5 of ['] Local5! , endof 6 of ['] Local6! , endof 7 of ['] Local7! , endof 8 of ['] Local8! , endof 9 of ['] Local9! , endof 10 of ['] Local10! , endof 11 of ['] Local11! , endof cr ." Can't save to local variable! " cr exit endcase ; immediate \ returns the first local variable's value : Local0@ CELL 0 * getBaseAddress + @ ; \ returns the second local variable's value : Local1@ CELL 1 * getBaseAddress + @ ; \ returns the third local variable's value : Local2@ CELL 2 * getBaseAddress + @ ; \ returns the fourth local variable's value : Local3@ CELL 3 * getBaseAddress + @ ; \ returns the fifth local variable's value : Local4@ CELL 4 * getBaseAddress + @ ; \ returns the sixth local variable's value : Local5@ CELL 5 * getBaseAddress + @ ; \ returns the seventh local variable's value : Local6@ CELL 6 * getBaseAddress + @ ; \ returns the eighth local variable's value : Local7@ CELL 7 * getBaseAddress + @ ; \ returns the ninth local variable's value : Local8@ CELL 8 * getBaseAddress + @ ; \ returns the tenth local variable's value : Local9@ CELL 9 * getBaseAddress + @ ; \ returns the eleventh local variable's value : Local10@ CELL 10 * getBaseAddress + @ ; \ returns the twelfth local variable's value : Local11@ CELL 11 * getBaseAddress + @ ; \ determines if a symbol is a local variable : LFIND ( addr len - ) depth 2 < if \ if the address and length are not on the stack exit then 2dup ( addr len addr len ) getOrder ( addr len addr len - addr len n ) dup ( addr len n - addr len n n ) -1 = if \ if the symbol isn't a local variable drop ( addr len n - addr len ) else \ if the symbol is a local variable case 0 of ['] Local0@ , endof 1 of ['] Local1@ , endof 2 of ['] Local2@ , endof 3 of ['] Local3@ , endof 4 of ['] Local4@ , endof 5 of ['] Local5@ , endof 6 of ['] Local6@ , endof 7 of ['] Local7@ , endof 8 of ['] Local8@ , endof 9 of ['] Local9@ , endof 10 of ['] Local10@ , endof 11 of ['] Local11@ , endof \ default case 2drop ( addr len - ) cr ." Could not compile local variable!" cr TRUE exit endcase 2drop ( addr len - ) ." compiled" \ display this text when entering a local variable symbol FALSE then ; \ Redefine colon to clean up after { : ; usingLocals TRUE = if FALSE TO usingLocals postpone popLocalStack postpone setBaseAddress then postpone ; ; immediate ' lfind is mydefer \ makes lfind work in INTERPRET \ ************ OVERWRITE THESE WORDS IN interpreter.fs *************** Defer mydefer : interpret 0 >in ! begin parse-word dup 0> \ was there a word at all? while usingLocals if mydefer \ need to add a code to continue to the next iteration right here then $find if dup flags? 0<> state @ 0= or if execute else , \ compile mode && !immediate then else \ word is not known. maybe it's a number 2dup $number if span @ >in ! \ if we encountered an error, don't continue parsing type 3a emit -13 throw else -rot 2drop 1 handle-lit then then depth 200 >= if -3 throw then depth 0< if -4 throw then rdepth 200 >= if -5 throw then rdepth 0< if -6 throw then repeat 2drop ; : print-status ( exception -- ) space ?dup if dup sys-debug \ system debug hook case -1 of s" Aborted." type endof -2 of s" Aborted." type endof -3 of s" Stack Overflow." type 0 depth! endof -4 of s" Stack Underflow." type 0 depth! endof -5 of s" Return Stack Overflow." type endof -6 of s" Return Stack Underflow." type endof -13 of s" undefined word." type endof -15 of s" out of memory." type endof -21 of s" undefined method." type endof -22 of s" no such device." type endof -100 of endof \ local variable being used dup s" Exception #" type . 0 state ! endcase else state @ 0= if s" ok" else s" compiled" then type then cr ;

9 years, 6 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

9 years, 8 months

Patch for auto partition selection

by Programmingkid

This patch implements the auto partition selection feature. It makes commands like these works: "dir cd:,\" and "boot cd:,\\:tbxi". Any progress with the local variable patch? --- packages/mac-parts.c | 180 ++++++++++++++++++++++++++++---------------------- 1 files changed, 102 insertions(+), 78 deletions(-) diff --git a/packages/mac-parts.c b/packages/mac-parts.c index 18e4aa3..7e32423 100644 --- a/packages/mac-parts.c +++ b/packages/mac-parts.c @@ -34,7 +34,7 @@ do { printk("MAC-PARTS: " fmt , ##args); } while (0) typedef struct { xt_t seek_xt, read_xt; ucell offs_hi, offs_lo; - ucell size_hi, size_lo; + ucell size_hi, size_lo; unsigned int blocksize; phandle_t filesystem_ph; } macparts_info_t; @@ -58,15 +58,15 @@ macparts_open( macparts_info_t *di ) int want_bootcode = 0; phandle_t ph; ducell offs = 0, size = -1; - + DPRINTF("macparts_open '%s'\n", str ); - + /* - Arguments that we accept: - id: [0-7] - [(id)][,][filespec] - */ - + Arguments that we accept: + id: [0-7] + [(id)][,][filespec] + */ + if( str ) { if ( !strlen(str) ) parnum = -1; @@ -74,52 +74,52 @@ macparts_open( macparts_info_t *di ) /* Detect the boot parameters */ char *ptr; ptr = str; - + /* <id>,<file> */ if (*ptr >= '0' && *ptr <= '9' && *(ptr + 1) == ',') { parstr = ptr; *(ptr + 1) = '\0'; argstr = ptr + 2; } - + /* <id> */ else if (*ptr >= '0' && *ptr <='9' && *(ptr + 1) == '\0') { parstr = ptr; } - + /* ,<file> */ else if (*ptr == ',') { argstr = ptr + 1; } - + /* <file> */ else { argstr = str; } - + /* Convert the id to a partition number */ if (strlen(parstr)) parnum = atol(parstr); - + /* Detect if we are looking for the bootcode */ if (strcmp(argstr, "%BOOT") == 0) want_bootcode = 1; } } - + DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); - + DPRINTF("want_bootcode %d\n", want_bootcode); DPRINTF("macparts_open %d\n", parnum); - + di->filesystem_ph = 0; di->read_xt = find_parent_method("read"); di->seek_xt = find_parent_method("seek"); - + SEEK( 0 ); if( READ(&dmap, sizeof(dmap)) != sizeof(dmap) ) goto out; - + /* partition maps might support multiple block sizes; in this case, * pmPyPartStart is typically given in terms of 512 byte blocks. */ @@ -133,121 +133,145 @@ macparts_open( macparts_info_t *di ) SEEK( bs ); if( READ(&par, sizeof(par)) != sizeof(par) ) goto out; - if (__be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE) + if (__be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE) goto out; - + /* * Implement partition selection as per the PowerPC Microprocessor CHRP bindings */ - - if (str == NULL || parnum == 0) { - /* According to the spec, partition 0 as well as no arguments means the whole disk */ + + if (parnum == 0) { + /* According to the spec, partition 0 means the whole disk */ offs = (long long)0; size = (long long)__be32_to_cpu(dmap.sbBlkCount) * bs; - + di->blocksize = (unsigned int)bs; - + di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; - + di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; - + ret = -1; goto out; - - } else if (parnum == -1 && strlen(argstr)) { - + + } + + // if not partition, but a file was specified - example: boot cd:,\\:tbxi + else if (parnum == -1 && strlen(argstr)) + { DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); - + /* No partition was explicitly requested, but an argstr was passed in. - So let's find a suitable partition... */ - for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { + So let's find a suitable partition... */ + for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) + { SEEK( bs * parnum ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || - !__be32_to_cpu(par.pmPartBlkCnt) ) - break; - DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - - /* If we have a valid, allocated and readable partition... */ - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + + // If an Apple_HFS or Apple_HFSX partition was found + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) + { offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - + /* If the filename was set to %BOOT, we actually want the bootcode */ - if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { + if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) + { offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; size = (long long)__be32_to_cpu(par.pmBootSize); - + goto found; - } else { + } + + else + { /* Otherwise we were passed a filename and path. So let's - choose the first partition with a valid filesystem */ + choose the first partition with a valid filesystem */ DPUSH( offs ); PUSH_ih( my_parent() ); parword("find-filesystem"); - + ph = POP_ph(); if (ph) goto found; } } } - - } else { + + } + + // if no partition and no file was selected - example: "dir cd:,\" + else if (parnum == -1) + { + // search for the first partition of type Apple_HFS or Apple_HFSX + for(parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) + { + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) + { + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + goto found; + break; + } + } + } + + else { /* Another partition was explicitly requested */ SEEK( bs * parnum ); READ( &par, sizeof(par) ); - + if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; } } - + /* If we couldn't find a partition, exit */ if (size == -1) { DPRINTF("Unable to automatically find partition!\n"); goto out; } - + found: - + ret = -1; di->blocksize = (unsigned int)bs; - + di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; - + di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; - + /* We have a valid partition - so probe for a filesystem at the current offset */ DPRINTF("mac-parts: about to probe for fs\n"); DPUSH( offs ); PUSH_ih( my_parent() ); parword("find-filesystem"); DPRINTF("mac-parts: done fs probe\n"); - + ph = POP_ph(); if( ph ) { DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); di->filesystem_ph = ph; - + /* If the filename was %BOOT then it's not a real filename, so clear argstr before - attempting interpose */ + attempting interpose */ if (want_bootcode) argstr = strdup(""); - + /* If we have been asked to open a particular file, interpose the filesystem package with - the passed filename as an argument */ + the passed filename as an argument */ if (strlen(argstr)) { push_str( argstr ); PUSH_ph( ph ); @@ -256,9 +280,9 @@ found: } else { DPRINTF("mac-parts: no filesystem found; bypassing misc-files interpose\n"); } - + free( str ); - + out: PUSH( ret ); } @@ -268,7 +292,7 @@ static void macparts_probe( macparts_info_t *dummy ) { desc_map_t *dmap = (desc_map_t*)cell2pointer(POP()); - + DPRINTF("macparts_probe %x ?= %x\n", dmap->sbSig, DESC_MAP_SIGNATURE); if( __be16_to_cpu(dmap->sbSig) != DESC_MAP_SIGNATURE ) RET(0); @@ -280,7 +304,7 @@ static void macparts_get_info( macparts_info_t *di ) { DPRINTF("macparts_get_info"); - + PUSH( -1 ); /* no type */ PUSH( di->offs_lo ); PUSH( di->offs_hi ); @@ -307,21 +331,21 @@ macparts_seek(macparts_info_t *di ) { long long pos = DPOP(); long long offs, size; - + DPRINTF("macparts_seek %llx:\n", pos); - + /* Seek is invalid if we reach the end of the device */ size = ((ducell)di->size_hi << BITS) | di->size_lo; if (pos > size) RET( -1 ); - + /* Calculate the seek offset for the parent */ offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; offs += pos; DPUSH(offs); - + DPRINTF("macparts_seek parent offset %llx:\n", offs); - + call_package(di->seek_xt, my_parent()); } @@ -330,7 +354,7 @@ static void macparts_read(macparts_info_t *di ) { DPRINTF("macparts_read\n"); - + /* Pass the read back up to the parent */ call_package(di->read_xt, my_parent()); } @@ -348,8 +372,8 @@ static void macparts_dir( macparts_info_t *di ) { /* On PPC Mac, the first partition chosen according to the CHRP boot - specification (i.e. marked as bootable) may not necessarily contain - a valid FS */ + specification (i.e. marked as bootable) may not necessarily contain + a valid FS */ if ( di->filesystem_ph ) { PUSH( my_self() ); push_str("dir"); -- 1.7.5.4

9 years, 8 months

Detecting command key

by Programmingkid

What word in Open Firmware can be used to detect the command key being pushed? Something that isn't get-key-map. I have tried key, but it didn't work.

9 years, 8 months

[commit] r1067 - trunk/openbios-devel/fs/hfsplus

by repository service

Author: mcayland Date: Sun Oct 21 20:14:06 2012 New Revision: 1067 URL: http://tracker.coreboot.org/trac/openbios/changeset/1067 Log: amd64: Fix compilation from last commit to implement "dir" word for HFS+ filesystem. UInt64 is always defined as long long, so use %lld in the printf format string rather than PRId64 which can change size depending upon platform. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Oct 7 17:26:53 2012 (r1066) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Oct 21 20:14:06 2012 (r1067) @@ -551,7 +551,7 @@ if (r.record.type == HFSP_FILE) { /* Grab the file entry */ hfsp_cat_file *file = &r.record.u.file; - forth_printf("% 10" PRId64 " ", file->data_fork.total_size); + forth_printf("% 10lld ", file->data_fork.total_size); print_date(file->create_date); forth_printf(" %s\n", name); found = -1;

9 years, 8 months

Status on partition problem

by Programmingkid

I have tracked down some issues with the file mac-files.c. The one big issue is with a variable called str. It isn't set properly. When I type this command "dir cd:9,\Utilities", str should be set to "9,\Utilities". argstr should then be set to "\Utilities". This does not happen. Instead str is set to "9". I traced the issue with a function called my_args_copy(). That led me to a forth word called my-args. I'm not sure what this word does, or where it is defined. Reading some of the comments in various files, someone thinks that if no partition is specified, it means the whole disk is selected. My plan is to change this so that is no partition is selected, it means to select the first Apple_HFS or Apple_HSFX partition. If someone wants to use an entire disk, they have to explicitly specify it by using zero as the partition number. This fix should make automatically selecting a partition work. Hope this makes sense.

9 years, 8 months

Re: [OpenBIOS] About HFS+ support

by Programmingkid

I did some research with Apple's Open Firmware implementation and found out something that might make fixing the auto partition selection system work. What Apple's Open Firmware does when a command like "dir hd:,\" is entered is it selects the partition that has the lowest partition number, and displays its files. What I did was partitioned a hard drive into three different partitions, then ran the "dir hd:,\" command. I have verified that the lowest numbered partition is selected by default. The other two partitions can be selected by doing this "dir hd:10,\" and "dir hd:11,\". Is there any more information that is needed to fix the auto selection system?

9 years, 8 months

Re: [OpenBIOS] About HFS+ support

by Mark Cave-Ayland

On 12/10/12 20:59, Programmingkid wrote: [CC to list] >> On 12/10/12 18:25, Programmingkid wrote: >> >>> I did some research with Apple's Open Firmware implementation and found out something that might make fixing the auto partition selection system work. What Apple's Open Firmware does when a command like "dir hd:,\" is entered is it selects the partition that has the lowest partition number, and displays its files. >>> >>> What I did was partitioned a hard drive into three different partitions, then ran the "dir hd:,\" command. I have verified that the lowest numbered partition is selected by default. The other two partitions can be selected by doing this "dir hd:10,\" and "dir hd:11,\". Is there any more information that is needed to fix the auto selection system? >> >> Do any of them have a system partition on? > > If you mean have an operating system on them, all three partitions have Mac OS X installed on them. > >> The reason I ask is that because on some of the debug traces you've sent me, a filesystem has been identified on the Apple_Driver43_CD partition. Therefore there must be some other logic involved with Apple's Open Firmware in order for it to locate the partition containing the installer. > > When you say the installer, I am guessing you mean the boot loader. > > For CD's, there is usually one partition that has the files on it. I think a simple algorithm for finding the right partition is to select the first partition that is of the type APPLE_HFS or APPLE_HFSX. Perhaps the algorithm really is that simple? For PearPC I found the following which suggests this is exactly what they do: http://old.nabble.com/Problems-booting-from-Panther-DVD-p104313.html I'd be interested to hear from people who have OF experience with Macs to confirm if this is the case or not. Have you coded up a suitable patch in OpenBIOS to test? ATB, Mark.

9 years, 8 months

[PATCH] Adds local variable support to OpenBIOS. Local variable implementation is based on Apple's local variable support in Open Firmware.

by Programmingkid

This patch has been improved from the last patch. Local variable code now is in its own file. The Array word has also been greatly simplified. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- forth/bootstrap/interpreter.fs | 51 +++- forth/util/build.xml | 1 + forth/util/locals.fs | 531 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 569 insertions(+), 14 deletions(-) create mode 100644 forth/util/locals.fs diff --git a/forth/bootstrap/interpreter.fs b/forth/bootstrap/interpreter.fs index 5187058..9221cdc 100644 --- a/forth/bootstrap/interpreter.fs +++ b/forth/bootstrap/interpreter.fs @@ -40,26 +40,20 @@ \ 7.3.9.2.4 Miscellaneous dictionary \ -\ interpreter. This word checks whether the interpreted word -\ is a word in dictionary or a number. It honours compile mode -\ and immediate/compile-only words. -: interpret - 0 >in ! - begin - parse-word dup 0> \ was there a word at all? - while - $find +\ Most of the old version of interpret +: old-interpret ( addr len -- ) + $find if dup flags? 0<> state @ 0= or if execute else - , \ compile mode && !immediate + , \ Compile mode && !immediate then - else \ word is not known. maybe it's a number + else \ Word is not known. maybe it's a number 2dup $number if - span @ >in ! \ if we encountered an error, don't continue parsing + span @ >in ! \ If we encountered an error, don't continue parsing type 3a emit -13 throw else @@ -70,9 +64,38 @@ depth 0< if -4 throw then rdepth 200 >= if -5 throw then rdepth 0< if -6 throw then +; + + +Defer lfind-defer +false VALUE using-locals + +\ The refactored interpret - supports local variables +: interpret ( -- ) + 0 >in ! + begin + parse-word ( addr len ) + dup ( addr len len1 ) + 0> ( addr len flag ) \ Was there a word at all? + while ( addr len ) + using-locals true = IF ( addr len ) \ If local variables are being used + 2dup ( addr len addr1 len1 ) + lfind-defer ( addr len flag ) + not IF ( addr len ) \ If symbol is not a local variable + old-interpret ( ) + ELSE \ Else clean up the stack + 2drop ( ) + THEN + + ELSE \ If not using local variables + old-interpret ( addr len -- ) + THEN + repeat - 2drop - ; + 2drop \ Removes the addr len pair if the loop ends at the WHILE word +; + + : refill ( -- ) ib #ib @ expect 0 >in ! ; diff --git a/forth/util/build.xml b/forth/util/build.xml index 4839d2c..d10f35a 100644 --- a/forth/util/build.xml +++ b/forth/util/build.xml @@ -11,6 +11,7 @@ <dictionary name="openbios" target="forth"> <object source="util.fs"/> <object source="pci.fs"/> + <object source="locals.fs"/>  diff --git a/forth/util/locals.fs b/forth/util/locals.fs new file mode 100644 index 0000000..22a6f55 --- /dev/null +++ b/forth/util/locals.fs @@ -0,0 +1,531 @@ +\ File: locals.fs +\ Description: Adds local variable support to OpenBIOS. This is Apple's local variable specification. + + +\ Creates an array variable +: ARRAY ( cellCount -- ) + + \ Compile-time behavior + CREATE CELLS ALLOT ( cellCount -- ) \ Creates and initializes the instance + + \ Run-time behavior + DOES> ( index addr ) + + SWAP CELLS + ( index addr -- addr1 ) \ Calculates address to return +; + + +\ Declare the local-base-address VALUE +0 VALUE local-base-address + +\ Returns the base address used for the local words +: get-base-address ( - addr ) + local-base-address +; + +\ Sets the base address used for the local words +: set-base-address ( addr - ) + TO local-base-address +; + + +\ Sets the first local variable's value +: Local0! ( x - ) + 0 CELLS get-base-address + ! +; + +\ Sets the second local variable's value +: Local1! ( x - ) + 1 CELLS get-base-address + ! +; + +\ Sets the third local variable's value +: Local2! ( x - ) + 2 CELLS get-base-address + ! +; + +\ Sets the fourth local variable's value +: Local3! ( x - ) + 3 CELLS get-base-address + ! +; + +\ Sets the fifth local variable's value +: Local4! ( x - ) + 4 CELLS get-base-address + ! +; + +\ Sets the sixth local variable's value +: Local5! ( x - ) + 5 CELLS get-base-address + ! +; + +\ Sets the seventh local variable's value +: Local6! ( x - ) + 6 CELLS get-base-address + ! +; + +\ Sets the eighth local variable's value +: Local7! ( x - ) + 7 CELLS get-base-address + ! +; + +\ Sets the ninth local variable's value +: Local8! ( x - ) + 8 CELLS get-base-address + ! +; + +\ Sets the tenth local variable's value +: Local9! ( x - ) + 9 CELLS get-base-address + ! +; + +\ Sets the eleventh local variable's value +: Local10! ( x - ) + 10 CELLS get-base-address + ! +; + +\ Sets the twelfth local variable's value +: Local11! ( x - ) + 11 CELLS get-base-address + ! +; + + +\ **** Calculates the needed amount of memory for local variables **** +0 value variableCount +: calculate-needed-memory ( - n ) + 0 TO variableCount + >in @ \ Keep track of where the pointer was + + begin + parse-word + 0= if \ If there is no more text to parse + drop + true + else + dup " ;" comp + 0= if \ If the semicolon is encountered + drop \ Drop the duplicated address + false + else + " }" comp + 0= if \ If '}' character is encountered + true \ End loop because '}' marks end of local variables + else + variableCount 1 + TO variableCount + false + then + then + then + until + + >in ! \ Reset the pointer + variableCount CELLS +; + + +\ **** allocates the memory for local variables **** +: allocate-memory ( n - addr ) + alloc-mem dup 0= if + drop + cr cr 10 spaces abort" Failed to allocate memory for local variables!" cr cr + then +; + + + +\ Declares the size of the local variable table +48 CONSTANT #local-table-elements + +\ Declare the local variable table +#local-table-elements ARRAY local-variable-table + +\ Keeps track of end of array +0 VALUE #filled-local-table-elements + +\ Clears the local variable table +: init-local-table ( - ) + + \ Free all the dynamically allocated memory + #filled-local-table-elements 0 ?do + I 3 + local-variable-table @ ( addr ) + free-mem ( ) + 4 +loop + + 0 local-variable-table #local-table-elements erase + 0 TO #filled-local-table-elements +; + +\ Adds a local variable symbol to the local variable table +: add-local ( addr len order initflag - ) + depth 4 < if + cr ." The stack needs at least 4 values to add a local variable." cr + exit + then + + \ Add to the end of the table + #filled-local-table-elements 0 + local-variable-table ! \ initflag + #filled-local-table-elements 1 + local-variable-table ! \ order + #filled-local-table-elements 2 + local-variable-table ! \ len + #filled-local-table-elements 3 + local-variable-table ! \ addr + + \ Allocate memory for the symbol + #filled-local-table-elements 2 + local-variable-table @ ( length ) + alloc-mem ( memaddr ) + dup ( memaddr memaddr ) + dup ( memaddr memaddr memaddr ) + + \ Called only when memaddr = 0 + 0= if ( memaddr memaddr ) + cr ." Failed to allocate memory in add-local!" cr ( memaddr memaddr ) + then + + \ Copy local variable name to a safe location + #filled-local-table-elements 3 + local-variable-table @ ( memaddr memaddr addr ) + swap ( memaddr addr memaddr ) + #filled-local-table-elements 2 + local-variable-table @ ( memaddr addr memaddr length ) + move ( memaddr ) + #filled-local-table-elements 3 + local-variable-table ! ( ) + + \ Increment #filled-local-table-elements + #filled-local-table-elements 4 + TO #filled-local-table-elements +; + +\ Prints the local variable table +: print-local-table + + #filled-local-table-elements 0= if + cr ." No variables loaded" cr + exit + then + + #filled-local-table-elements 0 ?do + cr ." Variable name: " + I 3 + local-variable-table @ + I 2 + local-variable-table @ + type + + ." Order: " + I 1 + local-variable-table @ . + + ." Init Flag: " + I 0 + local-variable-table @ . + 4 +loop +; + +\ Finds a local variable symbol in the local variable table +\ Returns its order or -1 on failure +: get-order ( addr len - order ) + \ If the address and length are missing + depth 2 < if + cr ." Address and length are required on the stack to use get-order!" cr + -1 throw \ Ends execution + then + + #filled-local-table-elements 0 ?do + over ( addr len addr ) + I 3 + ( addr len addr addrindex ) + local-variable-table @ ( addr len addr addr1 ) + 2 pick ( addr len addr addr1 len ) + + \ Check if lengths of two strings are the same length + dup ( addr len addr addr1 len len ) + I 2 + local-variable-table @ ( addr len addr addr1 len len len1) + = if ( addr len addr addr1 len ) \ If lengths are equal + comp ( addr len flag) + 0= if ( addr len flag ) \ If the symbol is found + 2drop ( ) + I 1 + local-variable-table @ ( order ) + unloop + exit + then + + else \ If the lengths are different + 3drop ( addr len ) + then + + \ Increment the index by 4 + 4 +loop + 2drop ( addr len - ) + -1 \ Returns -1 for the order if the symbol is not found +; + + +\ **** read the local variables in the input stream **** +0 VALUE use-top-stack-value +0 VALUE index +0 VALUE local-variable-memory + +: read-local-variables ( "char" - ) + 0 TO index + true TO use-top-stack-value + + begin + parse-word ( addr len ) + dup ( addr len len ) + 0> ( addr len flag ) + while ( addr len ) + 2dup ( addr len addr len ) + drop ( addr len addr ) + " }" ( addr len addr addr len ) + comp ( addr len flag ) + 0= if ( addr len ) \ If end of local variables + drop ( addr ) + drop ( ) + exit ( ) + then + + 2dup ( addr len addr len ) + drop ( addr len addr ) + " ;" ( addr len addr addr len ) + comp ( addr len flag ) + 0= ( addr len flag ) + + if ( addr len ) \ If not using top stack value for local variables + false TO use-top-stack-value ( addr len ) + 2drop ( ) + else \ Add local variable to table + index use-top-stack-value ( addr len order use-top-stack-value ) + add-local ( ) + index 1 + TO index \ Increment index + then + + repeat + drop ( addr ) + drop ( ) +; + + +\ Sets the stack size +1000 CONSTANT max-stack-size + +\ Declare the local stack +max-stack-size ARRAY local-stack + +\ Declare the stack top pointer +0 VALUE local-stack-top + +\ Adds to the top of the local stack +: push-local-stack ( x - L:x ) + local-stack-top max-stack-size 1 - > + if + cr ." Local stack overflow!" cr + max-stack-size TO local-stack-top \ Sets local-stack-top back to the max size + then + local-stack-top local-stack ! ( x - ) + local-stack-top 1 + TO local-stack-top +; + + +\ Removes the top local stack value and places it into the data stack +: pop-local-stack ( L:x - x ) + local-stack-top 1 - TO local-stack-top \ Decrement local-stack-top + local-stack-top 0< if \ If popping too many items + cr ." Local stack underflow!" cr + 0 TO local-stack-top \ Sets local-stack-top back to zero + abort + then + local-stack-top local-stack @ +; + + +\ ***** sets up local variables ****** +: { ( -- ) + init-local-table + calculate-needed-memory ( memorySize ) + allocate-memory ( memorySize - addr ) + TO local-variable-memory ( ) + read-local-variables ( ) + TRUE TO using-locals + + \ Add code to the current definition + + \ Saves the old base address + postpone get-base-address + postpone push-local-stack + + \ Sets the base address to this definition's reserved memory + local-variable-memory + postpone literal + postpone set-base-address + + \ Add code to initialize the variables if needed + 0 #filled-local-table-elements 4 - ?do + I 0 + local-variable-table @ ( flag ) \ Get the init flag + true ( flag true ) + = ( flag1 ) + if + I 4 / ( variable number ) + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + then + -4 +loop + +; immediate \ Declares this word as a compiler directive + + + +\ Sets values for local variables +: -> ( - ) + parse-word ( addr len ) + get-order ( order ) + dup ( order order ) + -1 = ( order flag ) + + if \ If the symbol isn't found + cr ." Symbol is not a local variable! " cr + drop ( ) + exit + then + + case + 0 of ['] Local0! , endof + 1 of ['] Local1! , endof + 2 of ['] Local2! , endof + 3 of ['] Local3! , endof + 4 of ['] Local4! , endof + 5 of ['] Local5! , endof + 6 of ['] Local6! , endof + 7 of ['] Local7! , endof + 8 of ['] Local8! , endof + 9 of ['] Local9! , endof + 10 of ['] Local10! , endof + 11 of ['] Local11! , endof + + cr ." Can't save to local variable! " cr + exit + + endcase + +; immediate + + +\ Returns the first local variable's value +: Local0@ + 0 CELLS get-base-address + @ +; + +\ Returns the second local variable's value +: Local1@ + 1 CELLS get-base-address + @ +; + +\ Returns the third local variable's value +: Local2@ + 2 CELLS get-base-address + @ +; + +\ Returns the fourth local variable's value +: Local3@ + 3 CELLS get-base-address + @ +; + +\ Returns the fifth local variable's value +: Local4@ + 4 CELLS get-base-address + @ +; + +\ Returns the sixth local variable's value +: Local5@ + 5 CELLS get-base-address + @ +; + +\ Returns the seventh local variable's value +: Local6@ + 6 CELLS get-base-address + @ +; + +\ Returns the eighth local variable's value +: Local7@ + 7 CELLS get-base-address + @ +; + +\ Returns the ninth local variable's value +: Local8@ + 8 CELLS get-base-address + @ +; + +\ Returns the tenth local variable's value +: Local9@ + 9 CELLS get-base-address + @ +; + +\ Returns the eleventh local variable's value +: Local10@ + 10 CELLS get-base-address + @ +; + +\ Returns the twelfth local variable's value +: Local11@ + 11 CELLS get-base-address + @ +; + + +\ Determines if a symbol is a local variable +\ Returns true if the symbol is a local variable, false otherwise +: LFIND ( addr len - flag ) + depth 2 < if \ If the address and length are not on the stack + exit + then + + get-order ( addr len - n ) + dup ( n n1 ) + -1 = if ( n ) \ If the symbol isn't a local variable + drop ( ) + false ( flag ) + + else \ If the symbol is a local variable + case ( n ) + 0 of ['] Local0@ , endof + 1 of ['] Local1@ , endof + 2 of ['] Local2@ , endof + 3 of ['] Local3@ , endof + 4 of ['] Local4@ , endof + 5 of ['] Local5@ , endof + 6 of ['] Local6@ , endof + 7 of ['] Local7@ , endof + 8 of ['] Local8@ , endof + 9 of ['] Local9@ , endof + 10 of ['] Local10@ , endof + 11 of ['] Local11@ , endof + + \ Default case + cr ." Could not compile local variable!" cr + TRUE ( flag ) + exit + + endcase + + ." compiled " \ Display this text when entering a local variable symbol + true ( flag ) + then +; + + +\ Redefine colon to clean up after { +: ; + using-locals TRUE = + if + FALSE TO using-locals + postpone pop-local-stack + postpone set-base-address + then + postpone ; +; immediate + +' lfind is lfind-defer \ Makes lfind work in INTERPRET \ No newline at end of file -- 1.7.5.4

9 years, 8 months

Re: [OpenBIOS] About HFS+ support

by Programmingkid

On Oct 9, 2012, at 1:11 PM, Mark Cave-Ayland wrote: > On 09/10/12 03:31, Programmingkid wrote: > >> I'm not familiar with how file systems work, but maybe you can make sense of this output. This is what I see when I enabled the debug macro. > > Hmmm. According to that, I'd guess that it's found a filesystem it recognises, but then when it repeats the same seek at found: then it fails the second time around? > > I'm afraid you'll need to poke around a bit more/adding debugging DPRINTF statements to figure out exactly what's happening. > > BTW you should try and keep on the list wherever possible, since there may be some people with Apple partition knowledge on there who could help out. > Ok. I will CC our info later to the list. We can find out the name of each partition, so can't we just select the partition that is named APPLE_HFS, or APPLE_HFSX?

9 years, 8 months