[OpenBIOS] [commit] r1354 - trunk/fcode-utils-devel/toke

[repository service]

Author: mcayland
Date: Fri Nov  6 16:06:25 2015
New Revision: 1354
URL: http://tracker.coreboot.org/trac/openbios/changeset/1354

Log:
toke: fix line parsing on big-endian

Trying to compile openbios on Fedora 22 ppc64, I had the following error:

toke -o QEMU,VGA.bin ~/openbios/drivers/vga.fs
...
Tokenizing  ~/openbios/drivers/vga.fs   Binary output to QEMU,VGA.bin
Warning:  File ~/openbios/drivers/vga.fs, Line 1.  Unterminated comment
Nothing Tokenized.  1 Warning.

This can be reproduced with the fcode-utils examples.

"toke" is parsing the comment line until it finds a '\n'.
The '\n' is stored as a char in a field of an union,
but it is read as a long. It works well on little endian but
not on big endian.

Signed-off-by: Laurent Vivier <laurent at vivier.eu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>

Modified:
   trunk/fcode-utils-devel/toke/scanner.c

Modified: trunk/fcode-utils-devel/toke/scanner.c
==============================================================================
--- trunk/fcode-utils-devel/toke/scanner.c	Fri Oct 23 14:58:22 2015	(r1353)
+++ trunk/fcode-utils-devel/toke/scanner.c	Fri Nov  6 16:06:25 2015	(r1354)
@@ -1625,7 +1625,7 @@
 
 void user_message( tic_param_t pfield )
 {
-    char delim = (char)pfield.deflt_elem ;
+    char delim = (char)pfield.fw_token ;
     handle_user_message( delim, TRUE);
 }
 
@@ -5295,7 +5295,7 @@
 
 void process_remark( tic_param_t pfield )
 {
-    char until_char = (char)pfield.deflt_elem ;
+    char until_char = (char)pfield.fw_token ;
     unsigned int start_lineno = lineno;
 
 #ifdef DEBUG_SCANNER