Skip to content

Commit 08b0f19

Browse files
author
Stefan Reinauer
committed
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 parent b8940c7 commit 08b0f19

8 files changed

Lines changed: 12 additions & 14 deletions

File tree

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ clean:
4040
$(MAKE) -C testsuite clean
4141

4242
distclean: clean
43-
$(MAKE) -C toke distclean
44-
$(MAKE) -C detok distclean
45-
$(MAKE) -C romheaders distclean
4643
$(MAKE) -C testsuite distclean
4744
find . -name "*.gcda" -exec rm -f \{\} \;
4845
find . -name "*.gcno" -exec rm -f \{\} \;

detok/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ $(PROGRAM): $(OBJS)
5252
clean:
5353
rm -f $(OBJS) *~
5454
rm -f $(PROGRAM) .dependencies
55-
55+
5656
.dependencies: *.c
5757
@$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies
5858

59-
.PHONY: all clean distclean
59+
.PHONY: all clean
6060

6161
-include .dependencies
6262

detok/dictionary.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ token_t detok_table[] = {
361361
TOKEN_ENTRY(0x0da, "get-token"),
362362
TOKEN_ENTRY(0x0db, "set-token"),
363363
TOKEN_ENTRY(0x0dc, "state"),
364-
TOKEN_ENTRY(0x0dd, "compile"),
364+
TOKEN_ENTRY(0x0dd, "compile,"),
365365
TOKEN_ENTRY(0x0de, "behavior"),
366366
TOKEN_ENTRY(0x0f0, "start0"),
367367
TOKEN_ENTRY(0x0f1, "start1"),

toke/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ clean:
6060
documentation:: *.c *.h toke.doxygen
6161
@doxygen toke.doxygen
6262

63-
.PHONY: all clean distclean
63+
.PHONY: all clean
6464

6565
-include .dependencies
6666

toke/dictionary.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ static tic_hdr_t tokens_table[] =
11191119
BUILTIN_FCODE( 0x0da, "get-token" ) ,
11201120
BUILTIN_FCODE( 0x0db, "set-token" ) ,
11211121
BI_FCODE_VRBLE( 0x0dc, "state" ) ,
1122-
BUILTIN_FCODE( 0x0dd, "compile" ) ,
1122+
BUILTIN_FCODE( 0x0dd, "compile," ) ,
11231123
BUILTIN_FCODE( 0x0de, "behavior" ) ,
11241124
BUILTIN_FCODE( 0x0f0, "start0" ) ,
11251125
BUILTIN_FCODE( 0x0f1, "start1" ) ,
@@ -1160,7 +1160,7 @@ static tic_hdr_t tokens_table[] =
11601160
BUILTIN_FCODE( 0x11e, "is-selftest" ) ,
11611161
BUILTIN_FCODE( 0x11f, "new-device" ) ,
11621162
BUILTIN_FCODE( 0x120, "diagnostic-mode?" ) ,
1163-
BUILTIN_FCODE( 0x121, "display-status" ) ,
1163+
OBSOLETE_FCODE( 0x121, "display-status" ) ,
11641164
BUILTIN_FCODE( 0x122, "memory-test-issue" ) ,
11651165
OBSOLETE_FCODE( 0x123, "group-code" ) ,
11661166
BI_FCODE_VRBLE( 0x124, "mask" ) ,

toke/examples/date.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
fcode-version2
44
." This program was tokenized on "
5-
fcode-date type
5+
[fcode-date] type
66
." at "
7-
fcode-time type
7+
[fcode-time] type
88
fcode-end
99

toke/examples/scsi-sample/overall.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
\ FCode driver for hypothetical SCSI host adapter
22

3+
fcode-version2
34
hex
45
" XYZI,scsi" name \ Name of device node
56
" XYZI,12346-01" model \ Manufacturer's model number

toke/examples/scsi-sample/scsitape.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ true instance value first-install? \ Used for rewind-on-first-open.
111111
0 false ( 0 false )
112112
else \ Decode status buffer ( xstatbuf )
113113
>r #requested ( #requested ) ( r: xstatbuf )
114-
r@ ili? r@ eof? or if ( #requested ) ( r: xstatbuf
115-
r@ residue - ( #xfered ) ( r: xstatbuf
116-
then ( #xfered ) ( r: xstatbuf
114+
r@ ili? r@ eof? or if ( #requested ) ( r: xstatbuf )
115+
r@ residue - ( #xfered ) ( r: xstatbuf )
116+
then ( #xfered ) ( r: xstatbuf )
117117
r> eof? ( #xfered flag )
118118
then
119119
else \ no error, #request = #xfered ( )

0 commit comments

Comments
 (0)