Commit 08b0f196d8be3d01ce7e08b0a0834b7debb8ad0d
2010-04-26T13:06:48
This is toke / detok update from Matthias Kapffer: - display-status is obsolete - fix the three broken examples under toke/examples - drop calls to non-existent distclean git-svn-id: svn://coreboot.org/openbios/trunk/fcode-utils-devel@753 f158a5a8-5612-0410-a976-696ce0be7e32
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
diff --git a/Makefile b/Makefile
index bd97123..96fe07f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,6 @@ clean:
$(MAKE) -C testsuite clean
distclean: clean
- $(MAKE) -C toke distclean
- $(MAKE) -C detok distclean
- $(MAKE) -C romheaders distclean
$(MAKE) -C testsuite distclean
find . -name "*.gcda" -exec rm -f \{\} \;
find . -name "*.gcno" -exec rm -f \{\} \;
diff --git a/detok/Makefile b/detok/Makefile
index 897e0eb..80d397f 100644
--- a/detok/Makefile
+++ b/detok/Makefile
@@ -52,11 +52,11 @@ $(PROGRAM): $(OBJS)
clean:
rm -f $(OBJS) *~
rm -f $(PROGRAM) .dependencies
-
+
.dependencies: *.c
@$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies
-.PHONY: all clean distclean
+.PHONY: all clean
-include .dependencies
diff --git a/detok/dictionary.c b/detok/dictionary.c
index b3d7abf..f5850da 100644
--- a/detok/dictionary.c
+++ b/detok/dictionary.c
@@ -361,7 +361,7 @@ token_t detok_table[] = {
TOKEN_ENTRY(0x0da, "get-token"),
TOKEN_ENTRY(0x0db, "set-token"),
TOKEN_ENTRY(0x0dc, "state"),
- TOKEN_ENTRY(0x0dd, "compile"),
+ TOKEN_ENTRY(0x0dd, "compile,"),
TOKEN_ENTRY(0x0de, "behavior"),
TOKEN_ENTRY(0x0f0, "start0"),
TOKEN_ENTRY(0x0f1, "start1"),
diff --git a/toke/Makefile b/toke/Makefile
index 82e7ab2..dc748eb 100644
--- a/toke/Makefile
+++ b/toke/Makefile
@@ -60,7 +60,7 @@ clean:
documentation:: *.c *.h toke.doxygen
@doxygen toke.doxygen
-.PHONY: all clean distclean
+.PHONY: all clean
-include .dependencies
diff --git a/toke/dictionary.c b/toke/dictionary.c
index d22c218..5be935f 100644
--- a/toke/dictionary.c
+++ b/toke/dictionary.c
@@ -1119,7 +1119,7 @@ static tic_hdr_t tokens_table[] =
BUILTIN_FCODE( 0x0da, "get-token" ) ,
BUILTIN_FCODE( 0x0db, "set-token" ) ,
BI_FCODE_VRBLE( 0x0dc, "state" ) ,
- BUILTIN_FCODE( 0x0dd, "compile" ) ,
+ BUILTIN_FCODE( 0x0dd, "compile," ) ,
BUILTIN_FCODE( 0x0de, "behavior" ) ,
BUILTIN_FCODE( 0x0f0, "start0" ) ,
BUILTIN_FCODE( 0x0f1, "start1" ) ,
@@ -1160,7 +1160,7 @@ static tic_hdr_t tokens_table[] =
BUILTIN_FCODE( 0x11e, "is-selftest" ) ,
BUILTIN_FCODE( 0x11f, "new-device" ) ,
BUILTIN_FCODE( 0x120, "diagnostic-mode?" ) ,
- BUILTIN_FCODE( 0x121, "display-status" ) ,
+ OBSOLETE_FCODE( 0x121, "display-status" ) ,
BUILTIN_FCODE( 0x122, "memory-test-issue" ) ,
OBSOLETE_FCODE( 0x123, "group-code" ) ,
BI_FCODE_VRBLE( 0x124, "mask" ) ,
diff --git a/toke/examples/date.fs b/toke/examples/date.fs
index 8d0b28f..5702eba 100644
--- a/toke/examples/date.fs
+++ b/toke/examples/date.fs
@@ -2,8 +2,8 @@
fcode-version2
." This program was tokenized on "
- fcode-date type
+ [fcode-date] type
." at "
- fcode-time type
+ [fcode-time] type
fcode-end
diff --git a/toke/examples/scsi-sample/overall.fs b/toke/examples/scsi-sample/overall.fs
index 5d2f61f..9361a82 100644
--- a/toke/examples/scsi-sample/overall.fs
+++ b/toke/examples/scsi-sample/overall.fs
@@ -1,5 +1,6 @@
\ FCode driver for hypothetical SCSI host adapter
+fcode-version2
hex
" XYZI,scsi" name \ Name of device node
" XYZI,12346-01" model \ Manufacturer's model number
diff --git a/toke/examples/scsi-sample/scsitape.fs b/toke/examples/scsi-sample/scsitape.fs
index ed27779..d39048a 100644
--- a/toke/examples/scsi-sample/scsitape.fs
+++ b/toke/examples/scsi-sample/scsitape.fs
@@ -111,9 +111,9 @@ true instance value first-install? \ Used for rewind-on-first-open.
0 false ( 0 false )
else \ Decode status buffer ( xstatbuf )
>r #requested ( #requested ) ( r: xstatbuf )
- r@ ili? r@ eof? or if ( #requested ) ( r: xstatbuf
- r@ residue - ( #xfered ) ( r: xstatbuf
- then ( #xfered ) ( r: xstatbuf
+ r@ ili? r@ eof? or if ( #requested ) ( r: xstatbuf )
+ r@ residue - ( #xfered ) ( r: xstatbuf )
+ then ( #xfered ) ( r: xstatbuf )
r> eof? ( #xfered flag )
then
else \ no error, #request = #xfered ( )