Fix the new kernel command-line parser

Impact: bug fix

We were incorrectly looking at [ds:di] instead of [es:di] for
verifying that a command was properly terminated.  Fix.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/core/runkernel.inc b/core/runkernel.inc
index b3968db..d068aa5 100644 (file)
--- a/core/runkernel.inc
+++ b/core/runkernel.inc
@@ -126,9 +126,10 @@ parse_cmdline:
 
                ; This either needs to have been an option with parameter,
                ; or be followed by EOL/whitespace
-               cmp byte [di-1],'='
+               mov ax,[es:di-1]                ; AL = last chr; AH = following
+               cmp al,'='
                je .is_match
-               cmp byte [di],' '
+               cmp ah,' '
                ja .no_match
 .is_match:
                pop ax                          ; Drop option pointer on stack