> compile NEMU

221220000 张三
Linux zzy 5.15.146.1-microsoft-standard-WSL2 #1 SMP Thu Jan 11 04:09:03 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
 18:05:05 up 11:21,  1 user,  load average: 0.54, 0.34, 0.20

nemu/src/monitor/sdb/expr.c

@@ -23,6 +23,7 @@
 enum {
   TK_NOTYPE = 256, TK_EQ,
   TK_DEC,
+  TK_NEG,
 
   /* TODO: Add more token types */
 
@@ -172,23 +173,30 @@ word_t eval(const Token* arr, size_t p, size_t q, bool* success) {
     *success = false;
     return 0;
   }
-  if (p == q) {
-    /* Single token.
-     * For now this token should be a number.
-     * Return the value of the number.
-     */
-    if (arr[p].type != TK_DEC) {
-      *success = false;
-      return 0;
-    }
-    return atoi(arr[p].str);
-  }
   else if (parten == 0) {
     /* The expression is surrounded by a matched pair of parentheses.
      * If that is the case, just throw away the parentheses.
      */
     return eval(arr, p + 1, q - 1, success);
   }
+
+
+  if (p == q || p == q - 1) {
+    /* Single token.
+     * For now this token should be a number.
+     * Return the value of the number.
+     */
+    if (arr[q].type != TK_DEC) {
+      *success = false;
+      return 0;
+    }
+
+    if (p != q && arr[p].type != '-') {
+      *success = false;
+      return 0;
+    }
+    return atoi(arr[q].str);
+  }
   else {
     /* We should do more things here. */
     size_t op = 0;

nemu/src/monitor/sdb/sdb.c

@@ -220,7 +220,7 @@ void init_sdb() {
   init_wp_pool();
 }
 
-int test_expr() {
+void _test_expr() {
   uint32_t expect, res;
   char buf[65536] = {0};
   if (scanf("%"PRIu32" %s", &expect, buf));
@@ -232,5 +232,16 @@ int test_expr() {
     fprintf(stdout, "test_expr Failed:");
   }
   printf("%"PRIuLEAST32" : %"PRIuLEAST32"\n", expect, res);
+}
+
+int test_expr(int argc, char *argv[]) {
+  char* res = argv[1];
+  int loop = 0;
+  if (res != NULL) {
+    loop = atoi(res);
+  }
+  while (loop--) {
+    _test_expr();
+  }
   return 0;
 }

nemu/src/nemu-main.c

@@ -29,8 +29,8 @@ int main(int argc, char *argv[]) {
 #endif
 
 #ifdef _TEST_EXPR_
-  int test_expr(void);
-  return test_expr();
+  int test_expr(int argc, char *argv[]);
+  return test_expr(argc, argv);
 #endif
   /* Start engine. */
   engine_start();

nemu/tools/gen-expr/gen-expr.c

@@ -50,18 +50,23 @@ static int pos;
         } \
       } while(0)
 
-static void _gen_rand_expr() {
+static void _gen_rand_expr(int deepth) {
+  if (deepth == 0) {
+    GEN_RAND();
+    return;
+  }
+  deepth -= 1;
   switch (choose(3)) {
     case 0: GEN_RAND(); break;
-    case 1: GEN("("); _gen_rand_expr(); GEN(")"); break;
-    default: _gen_rand_expr(); GEN_OP(); _gen_rand_expr(); break;
+    case 1: GEN("("); _gen_rand_expr(deepth); GEN(")"); break;
+    default: _gen_rand_expr(deepth); GEN_OP(); _gen_rand_expr(deepth); break;
   }
 }
 
 static void gen_rand_expr() {
   buf[0] = '\0';
   pos = 0;
-  _gen_rand_expr();
+  _gen_rand_expr(choose(10));
 }
 
 int main(int argc, char *argv[]) {