More lineinfo usage.

[cc65] / src / ca65 / instr.c

diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 74529865bbabea9b390b547ec0c4c3bf839178c8..39c32f2eadc91464c4ce2ba0a7ef04c88d52b2d4 100644 (file)
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2008, Ullrich von Bassewitz                                      */
+/* (C) 1998-2011, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -39,7 +39,6 @@
 
 /* common */
 #include "addrsize.h"
-#include "assertdefs.h"
 #include "attrib.h"
 #include "bitops.h"
 #include "check.h"
@@ -490,9 +489,7 @@ static const struct {
                { "BCC",  0x0020000, 0x90, 0, PutPCRel8 },
                { "BCS",  0x0020000, 0xb0, 0, PutPCRel8 },
                { "BEQ",  0x0020000, 0xf0, 0, PutPCRel8 },
-               { "BGE",  0x0020000, 0xb0, 0, PutPCRel8 },   /* == BCS */
                { "BIT",  0x0a0006c, 0x00, 2, PutAll },
-               { "BLT",  0x0020000, 0x90, 0, PutPCRel8 },   /* == BCC */
                { "BMI",  0x0020000, 0x30, 0, PutPCRel8 },
                { "BNE",  0x0020000, 0xd0, 0, PutPCRel8 },
                { "BPL",  0x0020000, 0x10, 0, PutPCRel8 },
@@ -1258,7 +1255,7 @@ static void PutTST (const InsDesc* Ins)
     EffAddr   A;
 
     /* The first argument is always an immediate byte */
-    if (Tok != TOK_HASH) {
+    if (CurTok.Tok != TOK_HASH) {
         ErrorSkip ("Invalid addressing mode");
         return;
     }