removed unused token from internal debugger command line parser

bochs/bx_debug/parser.h

@@ -55,94 +55,93 @@
      BX_TOKEN_CONTINUE = 272,
      BX_TOKEN_STEPN = 273,
      BX_TOKEN_STEP_OVER = 274,
-     BX_TOKEN_NEXT_STEP = 275,
-     BX_TOKEN_SET = 276,
-     BX_TOKEN_DEBUGGER = 277,
-     BX_TOKEN_LIST_BREAK = 278,
-     BX_TOKEN_VBREAKPOINT = 279,
-     BX_TOKEN_LBREAKPOINT = 280,
-     BX_TOKEN_PBREAKPOINT = 281,
-     BX_TOKEN_DEL_BREAKPOINT = 282,
-     BX_TOKEN_ENABLE_BREAKPOINT = 283,
-     BX_TOKEN_DISABLE_BREAKPOINT = 284,
-     BX_TOKEN_INFO = 285,
-     BX_TOKEN_QUIT = 286,
-     BX_TOKEN_R = 287,
-     BX_TOKEN_REGS = 288,
-     BX_TOKEN_CPU = 289,
-     BX_TOKEN_FPU = 290,
-     BX_TOKEN_MMX = 291,
-     BX_TOKEN_SSE = 292,
-     BX_TOKEN_AVX = 293,
-     BX_TOKEN_IDT = 294,
-     BX_TOKEN_IVT = 295,
-     BX_TOKEN_GDT = 296,
-     BX_TOKEN_LDT = 297,
-     BX_TOKEN_TSS = 298,
-     BX_TOKEN_TAB = 299,
-     BX_TOKEN_ALL = 300,
-     BX_TOKEN_LINUX = 301,
-     BX_TOKEN_DEBUG_REGS = 302,
-     BX_TOKEN_CONTROL_REGS = 303,
-     BX_TOKEN_SEGMENT_REGS = 304,
-     BX_TOKEN_EXAMINE = 305,
-     BX_TOKEN_XFORMAT = 306,
-     BX_TOKEN_DISFORMAT = 307,
-     BX_TOKEN_RESTORE = 308,
-     BX_TOKEN_SETPMEM = 309,
-     BX_TOKEN_SYMBOLNAME = 310,
-     BX_TOKEN_QUERY = 311,
-     BX_TOKEN_PENDING = 312,
-     BX_TOKEN_TAKE = 313,
-     BX_TOKEN_DMA = 314,
-     BX_TOKEN_IRQ = 315,
-     BX_TOKEN_HEX = 316,
-     BX_TOKEN_DISASM = 317,
-     BX_TOKEN_INSTRUMENT = 318,
-     BX_TOKEN_STRING = 319,
-     BX_TOKEN_STOP = 320,
-     BX_TOKEN_DOIT = 321,
-     BX_TOKEN_CRC = 322,
-     BX_TOKEN_TRACE = 323,
-     BX_TOKEN_TRACEREG = 324,
-     BX_TOKEN_TRACEMEM = 325,
-     BX_TOKEN_SWITCH_MODE = 326,
-     BX_TOKEN_SIZE = 327,
-     BX_TOKEN_PTIME = 328,
-     BX_TOKEN_TIMEBP_ABSOLUTE = 329,
-     BX_TOKEN_TIMEBP = 330,
-     BX_TOKEN_MODEBP = 331,
-     BX_TOKEN_VMEXITBP = 332,
-     BX_TOKEN_PRINT_STACK = 333,
-     BX_TOKEN_WATCH = 334,
-     BX_TOKEN_UNWATCH = 335,
-     BX_TOKEN_READ = 336,
-     BX_TOKEN_WRITE = 337,
-     BX_TOKEN_SHOW = 338,
-     BX_TOKEN_LOAD_SYMBOLS = 339,
-     BX_TOKEN_SYMBOLS = 340,
-     BX_TOKEN_LIST_SYMBOLS = 341,
-     BX_TOKEN_GLOBAL = 342,
-     BX_TOKEN_WHERE = 343,
-     BX_TOKEN_PRINT_STRING = 344,
-     BX_TOKEN_NUMERIC = 345,
-     BX_TOKEN_NE2000 = 346,
-     BX_TOKEN_PIC = 347,
-     BX_TOKEN_PAGE = 348,
-     BX_TOKEN_HELP = 349,
-     BX_TOKEN_CALC = 350,
-     BX_TOKEN_VGA = 351,
-     BX_TOKEN_PCI = 352,
-     BX_TOKEN_COMMAND = 353,
-     BX_TOKEN_GENERIC = 354,
-     BX_TOKEN_RSHIFT = 355,
-     BX_TOKEN_LSHIFT = 356,
-     BX_TOKEN_REG_IP = 357,
-     BX_TOKEN_REG_EIP = 358,
-     BX_TOKEN_REG_RIP = 359,
-     INDIRECT = 360,
-     NEG = 361,
-     NOT = 362
+     BX_TOKEN_SET = 275,
+     BX_TOKEN_DEBUGGER = 276,
+     BX_TOKEN_LIST_BREAK = 277,
+     BX_TOKEN_VBREAKPOINT = 278,
+     BX_TOKEN_LBREAKPOINT = 279,
+     BX_TOKEN_PBREAKPOINT = 280,
+     BX_TOKEN_DEL_BREAKPOINT = 281,
+     BX_TOKEN_ENABLE_BREAKPOINT = 282,
+     BX_TOKEN_DISABLE_BREAKPOINT = 283,
+     BX_TOKEN_INFO = 284,
+     BX_TOKEN_QUIT = 285,
+     BX_TOKEN_R = 286,
+     BX_TOKEN_REGS = 287,
+     BX_TOKEN_CPU = 288,
+     BX_TOKEN_FPU = 289,
+     BX_TOKEN_MMX = 290,
+     BX_TOKEN_SSE = 291,
+     BX_TOKEN_AVX = 292,
+     BX_TOKEN_IDT = 293,
+     BX_TOKEN_IVT = 294,
+     BX_TOKEN_GDT = 295,
+     BX_TOKEN_LDT = 296,
+     BX_TOKEN_TSS = 297,
+     BX_TOKEN_TAB = 298,
+     BX_TOKEN_ALL = 299,
+     BX_TOKEN_LINUX = 300,
+     BX_TOKEN_DEBUG_REGS = 301,
+     BX_TOKEN_CONTROL_REGS = 302,
+     BX_TOKEN_SEGMENT_REGS = 303,
+     BX_TOKEN_EXAMINE = 304,
+     BX_TOKEN_XFORMAT = 305,
+     BX_TOKEN_DISFORMAT = 306,
+     BX_TOKEN_RESTORE = 307,
+     BX_TOKEN_SETPMEM = 308,
+     BX_TOKEN_SYMBOLNAME = 309,
+     BX_TOKEN_QUERY = 310,
+     BX_TOKEN_PENDING = 311,
+     BX_TOKEN_TAKE = 312,
+     BX_TOKEN_DMA = 313,
+     BX_TOKEN_IRQ = 314,
+     BX_TOKEN_HEX = 315,
+     BX_TOKEN_DISASM = 316,
+     BX_TOKEN_INSTRUMENT = 317,
+     BX_TOKEN_STRING = 318,
+     BX_TOKEN_STOP = 319,
+     BX_TOKEN_DOIT = 320,
+     BX_TOKEN_CRC = 321,
+     BX_TOKEN_TRACE = 322,
+     BX_TOKEN_TRACEREG = 323,
+     BX_TOKEN_TRACEMEM = 324,
+     BX_TOKEN_SWITCH_MODE = 325,
+     BX_TOKEN_SIZE = 326,
+     BX_TOKEN_PTIME = 327,
+     BX_TOKEN_TIMEBP_ABSOLUTE = 328,
+     BX_TOKEN_TIMEBP = 329,
+     BX_TOKEN_MODEBP = 330,
+     BX_TOKEN_VMEXITBP = 331,
+     BX_TOKEN_PRINT_STACK = 332,
+     BX_TOKEN_WATCH = 333,
+     BX_TOKEN_UNWATCH = 334,
+     BX_TOKEN_READ = 335,
+     BX_TOKEN_WRITE = 336,
+     BX_TOKEN_SHOW = 337,
+     BX_TOKEN_LOAD_SYMBOLS = 338,
+     BX_TOKEN_SYMBOLS = 339,
+     BX_TOKEN_LIST_SYMBOLS = 340,
+     BX_TOKEN_GLOBAL = 341,
+     BX_TOKEN_WHERE = 342,
+     BX_TOKEN_PRINT_STRING = 343,
+     BX_TOKEN_NUMERIC = 344,
+     BX_TOKEN_NE2000 = 345,
+     BX_TOKEN_PIC = 346,
+     BX_TOKEN_PAGE = 347,
+     BX_TOKEN_HELP = 348,
+     BX_TOKEN_CALC = 349,
+     BX_TOKEN_VGA = 350,
+     BX_TOKEN_PCI = 351,
+     BX_TOKEN_COMMAND = 352,
+     BX_TOKEN_GENERIC = 353,
+     BX_TOKEN_RSHIFT = 354,
+     BX_TOKEN_LSHIFT = 355,
+     BX_TOKEN_REG_IP = 356,
+     BX_TOKEN_REG_EIP = 357,
+     BX_TOKEN_REG_RIP = 358,
+     INDIRECT = 359,
+     NEG = 360,
+     NOT = 361
    };
 #endif
 /* Tokens.  */
@@ -163,94 +162,93 @@
 #define BX_TOKEN_CONTINUE 272
 #define BX_TOKEN_STEPN 273
 #define BX_TOKEN_STEP_OVER 274
-#define BX_TOKEN_NEXT_STEP 275
-#define BX_TOKEN_SET 276
-#define BX_TOKEN_DEBUGGER 277
-#define BX_TOKEN_LIST_BREAK 278
-#define BX_TOKEN_VBREAKPOINT 279
-#define BX_TOKEN_LBREAKPOINT 280
-#define BX_TOKEN_PBREAKPOINT 281
-#define BX_TOKEN_DEL_BREAKPOINT 282
-#define BX_TOKEN_ENABLE_BREAKPOINT 283
-#define BX_TOKEN_DISABLE_BREAKPOINT 284
-#define BX_TOKEN_INFO 285
-#define BX_TOKEN_QUIT 286
-#define BX_TOKEN_R 287
-#define BX_TOKEN_REGS 288
-#define BX_TOKEN_CPU 289
-#define BX_TOKEN_FPU 290
-#define BX_TOKEN_MMX 291
-#define BX_TOKEN_SSE 292
-#define BX_TOKEN_AVX 293
-#define BX_TOKEN_IDT 294
-#define BX_TOKEN_IVT 295
-#define BX_TOKEN_GDT 296
-#define BX_TOKEN_LDT 297
-#define BX_TOKEN_TSS 298
-#define BX_TOKEN_TAB 299
-#define BX_TOKEN_ALL 300
-#define BX_TOKEN_LINUX 301
-#define BX_TOKEN_DEBUG_REGS 302
-#define BX_TOKEN_CONTROL_REGS 303
-#define BX_TOKEN_SEGMENT_REGS 304
-#define BX_TOKEN_EXAMINE 305
-#define BX_TOKEN_XFORMAT 306
-#define BX_TOKEN_DISFORMAT 307
-#define BX_TOKEN_RESTORE 308
-#define BX_TOKEN_SETPMEM 309
-#define BX_TOKEN_SYMBOLNAME 310
-#define BX_TOKEN_QUERY 311
-#define BX_TOKEN_PENDING 312
-#define BX_TOKEN_TAKE 313
-#define BX_TOKEN_DMA 314
-#define BX_TOKEN_IRQ 315
-#define BX_TOKEN_HEX 316
-#define BX_TOKEN_DISASM 317
-#define BX_TOKEN_INSTRUMENT 318
-#define BX_TOKEN_STRING 319
-#define BX_TOKEN_STOP 320
-#define BX_TOKEN_DOIT 321
-#define BX_TOKEN_CRC 322
-#define BX_TOKEN_TRACE 323
-#define BX_TOKEN_TRACEREG 324
-#define BX_TOKEN_TRACEMEM 325
-#define BX_TOKEN_SWITCH_MODE 326
-#define BX_TOKEN_SIZE 327
-#define BX_TOKEN_PTIME 328
-#define BX_TOKEN_TIMEBP_ABSOLUTE 329
-#define BX_TOKEN_TIMEBP 330
-#define BX_TOKEN_MODEBP 331
-#define BX_TOKEN_VMEXITBP 332
-#define BX_TOKEN_PRINT_STACK 333
-#define BX_TOKEN_WATCH 334
-#define BX_TOKEN_UNWATCH 335
-#define BX_TOKEN_READ 336
-#define BX_TOKEN_WRITE 337
-#define BX_TOKEN_SHOW 338
-#define BX_TOKEN_LOAD_SYMBOLS 339
-#define BX_TOKEN_SYMBOLS 340
-#define BX_TOKEN_LIST_SYMBOLS 341
-#define BX_TOKEN_GLOBAL 342
-#define BX_TOKEN_WHERE 343
-#define BX_TOKEN_PRINT_STRING 344
-#define BX_TOKEN_NUMERIC 345
-#define BX_TOKEN_NE2000 346
-#define BX_TOKEN_PIC 347
-#define BX_TOKEN_PAGE 348
-#define BX_TOKEN_HELP 349
-#define BX_TOKEN_CALC 350
-#define BX_TOKEN_VGA 351
-#define BX_TOKEN_PCI 352
-#define BX_TOKEN_COMMAND 353
-#define BX_TOKEN_GENERIC 354
-#define BX_TOKEN_RSHIFT 355
-#define BX_TOKEN_LSHIFT 356
-#define BX_TOKEN_REG_IP 357
-#define BX_TOKEN_REG_EIP 358
-#define BX_TOKEN_REG_RIP 359
-#define INDIRECT 360
-#define NEG 361
-#define NOT 362
+#define BX_TOKEN_SET 275
+#define BX_TOKEN_DEBUGGER 276
+#define BX_TOKEN_LIST_BREAK 277
+#define BX_TOKEN_VBREAKPOINT 278
+#define BX_TOKEN_LBREAKPOINT 279
+#define BX_TOKEN_PBREAKPOINT 280
+#define BX_TOKEN_DEL_BREAKPOINT 281
+#define BX_TOKEN_ENABLE_BREAKPOINT 282
+#define BX_TOKEN_DISABLE_BREAKPOINT 283
+#define BX_TOKEN_INFO 284
+#define BX_TOKEN_QUIT 285
+#define BX_TOKEN_R 286
+#define BX_TOKEN_REGS 287
+#define BX_TOKEN_CPU 288
+#define BX_TOKEN_FPU 289
+#define BX_TOKEN_MMX 290
+#define BX_TOKEN_SSE 291
+#define BX_TOKEN_AVX 292
+#define BX_TOKEN_IDT 293
+#define BX_TOKEN_IVT 294
+#define BX_TOKEN_GDT 295
+#define BX_TOKEN_LDT 296
+#define BX_TOKEN_TSS 297
+#define BX_TOKEN_TAB 298
+#define BX_TOKEN_ALL 299
+#define BX_TOKEN_LINUX 300
+#define BX_TOKEN_DEBUG_REGS 301
+#define BX_TOKEN_CONTROL_REGS 302
+#define BX_TOKEN_SEGMENT_REGS 303
+#define BX_TOKEN_EXAMINE 304
+#define BX_TOKEN_XFORMAT 305
+#define BX_TOKEN_DISFORMAT 306
+#define BX_TOKEN_RESTORE 307
+#define BX_TOKEN_SETPMEM 308
+#define BX_TOKEN_SYMBOLNAME 309
+#define BX_TOKEN_QUERY 310
+#define BX_TOKEN_PENDING 311
+#define BX_TOKEN_TAKE 312
+#define BX_TOKEN_DMA 313
+#define BX_TOKEN_IRQ 314
+#define BX_TOKEN_HEX 315
+#define BX_TOKEN_DISASM 316
+#define BX_TOKEN_INSTRUMENT 317
+#define BX_TOKEN_STRING 318
+#define BX_TOKEN_STOP 319
+#define BX_TOKEN_DOIT 320
+#define BX_TOKEN_CRC 321
+#define BX_TOKEN_TRACE 322
+#define BX_TOKEN_TRACEREG 323
+#define BX_TOKEN_TRACEMEM 324
+#define BX_TOKEN_SWITCH_MODE 325
+#define BX_TOKEN_SIZE 326
+#define BX_TOKEN_PTIME 327
+#define BX_TOKEN_TIMEBP_ABSOLUTE 328
+#define BX_TOKEN_TIMEBP 329
+#define BX_TOKEN_MODEBP 330
+#define BX_TOKEN_VMEXITBP 331
+#define BX_TOKEN_PRINT_STACK 332
+#define BX_TOKEN_WATCH 333
+#define BX_TOKEN_UNWATCH 334
+#define BX_TOKEN_READ 335
+#define BX_TOKEN_WRITE 336
+#define BX_TOKEN_SHOW 337
+#define BX_TOKEN_LOAD_SYMBOLS 338
+#define BX_TOKEN_SYMBOLS 339
+#define BX_TOKEN_LIST_SYMBOLS 340
+#define BX_TOKEN_GLOBAL 341
+#define BX_TOKEN_WHERE 342
+#define BX_TOKEN_PRINT_STRING 343
+#define BX_TOKEN_NUMERIC 344
+#define BX_TOKEN_NE2000 345
+#define BX_TOKEN_PIC 346
+#define BX_TOKEN_PAGE 347
+#define BX_TOKEN_HELP 348
+#define BX_TOKEN_CALC 349
+#define BX_TOKEN_VGA 350
+#define BX_TOKEN_PCI 351
+#define BX_TOKEN_COMMAND 352
+#define BX_TOKEN_GENERIC 353
+#define BX_TOKEN_RSHIFT 354
+#define BX_TOKEN_LSHIFT 355
+#define BX_TOKEN_REG_IP 356
+#define BX_TOKEN_REG_EIP 357
+#define BX_TOKEN_REG_RIP 358
+#define INDIRECT 359
+#define NEG 360
+#define NOT 361
 
 
 
@@ -269,7 +267,7 @@ typedef union YYSTYPE
 
 
 /* Line 1685 of yacc.c  */
-#line 273 "y.tab.h"
+#line 271 "y.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

bochs/bx_debug/parser.y

@@ -39,7 +39,6 @@
 %token <sval> BX_TOKEN_CONTINUE
 %token <sval> BX_TOKEN_STEPN
 %token <sval> BX_TOKEN_STEP_OVER
-%token <sval> BX_TOKEN_NEXT_STEP
 %token <sval> BX_TOKEN_SET
 %token <sval> BX_TOKEN_DEBUGGER
 %token <sval> BX_TOKEN_LIST_BREAK