From dcecd625336c4e1c8bcf92955144adc3952fc1dc Mon Sep 17 00:00:00 2001 From: tracer-ysyx Date: Tue, 16 Jan 2024 00:06:48 +0800 Subject: [PATCH] =?UTF-8?q?>=20compile=20NEMU=20ysyx=5F22040000=20?= =?UTF-8?q?=E6=9D=8E=E5=BF=83=E6=9D=A8=20Linux=20calcite=206.1.71=20#1-Nix?= =?UTF-8?q?OS=20SMP=20PREEMPT=5FDYNAMIC=20Fri=20Jan=20=205=2014:18:41=20UT?= =?UTF-8?q?C=202024=20x86=5F64=20GNU/Linux=20=2000:06:48=20=20up=202=20day?= =?UTF-8?q?s=2013:01,=20=202=20users,=20=20load=20average:=200.74,=200.57,?= =?UTF-8?q?=200.51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nemu/src/monitor/sdb/addrexp.l | 2 +- nemu/tests/expr_test.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nemu/src/monitor/sdb/addrexp.l b/nemu/src/monitor/sdb/addrexp.l index 255c4ce..d702c5a 100644 --- a/nemu/src/monitor/sdb/addrexp.l +++ b/nemu/src/monitor/sdb/addrexp.l @@ -10,7 +10,7 @@ 0[xX][0-9a-fA-F]+ { yylval = strtoul(yytext, NULL, 16); return HEX_NUMBER; } [0-9]+ { yylval = strtoul(yytext, NULL, 10); return NUMBER; } -${1,2}[a-zA-Z]{2,3} { +$[asgprt$][0-9pa][0-9]? { yylval = isa_reg_str2val(yytext + 1, &success); if(!success) { yyerror(NULL, "Failed to convert reg to value"); diff --git a/nemu/tests/expr_test.c b/nemu/tests/expr_test.c index eb1cf67..f0db0d5 100644 --- a/nemu/tests/expr_test.c +++ b/nemu/tests/expr_test.c @@ -175,7 +175,6 @@ START_TEST(test_expr_plain_register) { for (i = 1; i < 32; i++) { ck_assert(strcpy(buf + 1, regs[i])); gpr(i) = i; - printf("%d: %s\n", i, buf); yy_scan_string(buf); result = yyparse(&value); ck_assert_msg(result == 0, "expr = %s\n", buf);