Macで動作するよう修正

diff --git a/src/monitor.c b/src/monitor.c
index b9ed2fa9a4e6c9a7bd843060b3ee173ed359b415..8fd17b1cb79083c7a41801f75d44acc81be52118 100644 (file)
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <readline/readline.h>
-#include <readline/history.h>
 #include "monitor.h"
 #include "disassemble.h"
 
@@ -376,11 +375,6 @@ int monquit()
     free_cmdtable(HASH_CMDTYPE);
     free_cmdtable(HASH_CODE);
 
-    /* Readline 関連のメモリを明示的に解放 */
-    rl_clear_history();
-    rl_cleanup_after_signal();
-    rl_free_line_state();
-
     if(cerr->num > 0) {
         stat = 1;
     }

diff --git a/test/system/comet2monitor/break_help_2/0.txt b/test/system/comet2monitor/break_help_2/0.txt
index 8f1d3af9c0618582c9e7845cc14b9834f06cb25f..8754ab73ced0428f2b0fd187e8681605f4e46652 100644 (file)
--- a/test/system/comet2monitor/break_help_2/0.txt
+++ b/test/system/comet2monitor/break_help_2/0.txt
@@ -1,8 +1,9 @@
 COMET II machine code monitor. Type ? for help.
-Info: arguments '1' are ignored.
 > b ? 1
 breakpoint manipulate:
     b[reak] a[dd] <address>
     b[reak] d[el] <address>
     b[reak] l[ist]
     b[reak] r[eset]
+
+Info: arguments '1' are ignored.

diff --git a/test/system/comet2monitor/break_help_2/cmd b/test/system/comet2monitor/break_help_2/cmd
index bd44f3acfd768dfdb27273d1b1ac80f72a4bd7a2..aebf4d29ea1072ce873e941e8761dde5ba5331f0 100755 (executable)
--- a/test/system/comet2monitor/break_help_2/cmd
+++ b/test/system/comet2monitor/break_help_2/cmd
@@ -1 +1 @@
-../../../../comet2monitor <break_help_2.monitor 2>&1 | sed '/^(comet2 monitor) /d'
+../../../../comet2monitor <break_help_2.monitor 2>&1 | sed -e '/^(comet2 monitor) /d; /^Info/H; /^Info/d; $G'

diff --git a/test/system/comet2monitor/dump_3/0.txt b/test/system/comet2monitor/dump_3/0.txt
index 02be83f14fdb616a07a3e798e87a76d3d462b530..f0b74a7dcf2bbd8aa299058dfe2c1304ce08894c 100644 (file)
--- a/test/system/comet2monitor/dump_3/0.txt
+++ b/test/system/comet2monitor/dump_3/0.txt
@@ -1,9 +1,10 @@
 COMET II machine code monitor. Type ? for help.
 > l sum_10.o
-Info: arguments '#40' are ignored.
 > d 0 #20 #40
 #0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F
        -------------------------------------------------------------------------------------
 #0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
 #0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
 #0000: 0020: 0000
+
+Info: arguments '#40' are ignored.

diff --git a/test/system/comet2monitor/dump_3/cmd b/test/system/comet2monitor/dump_3/cmd
index 21cef755c0284cf25faf7efbac456df4e8442a0c..bcad3261952b324d72ca8d123b08bf487d40e86b 100755 (executable)
--- a/test/system/comet2monitor/dump_3/cmd
+++ b/test/system/comet2monitor/dump_3/cmd
@@ -1 +1 @@
-../../../../comet2monitor <dump_3.monitor 2>&1 | sed '/^(comet2 monitor) /d'
+../../../../comet2monitor <dump_3.monitor 2>&1 | sed -e '/^(comet2 monitor) /d; /^Info/H; /^Info/d; $G'