2001-06-28 Jeff Johnston <jjohnstn@redhat.com>

        * arm7f.cxx (arm7f_cpu::memory_trap): Remove code under now
        non-existent debug_exec_p flag.
        (arm7f_cpu::arm_tbit_set): Change reference to debug_exec_p to
        use new warnings_enabled flag.
        * hw-cpu-arm7t.txt: Change all debug-exec? references to
        enable-warnings?.

diff --git a/sid/component/cgen-cpu/arm7t/ChangeLog b/sid/component/cgen-cpu/arm7t/ChangeLog
index aa71cdb..bcb2376 100644 (file)
--- a/sid/component/cgen-cpu/arm7t/ChangeLog
+++ b/sid/component/cgen-cpu/arm7t/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * arm7f.cxx (arm7f_cpu::memory_trap): Remove code under now
+        non-existent debug_exec_p flag.
+        (arm7f_cpu::arm_tbit_set): Change reference to debug_exec_p to 
+       use new warnings_enabled flag.
+        * hw-cpu-arm7t.txt: Change all debug-exec? references to
+       enable-warnings?.
+
 2001-06-26  Frank Ch. Eigler  <fche@redhat.com>
 
        * Makefile.am (ACLOCAL_AMFLAGS): Refer to $srcdir.

diff --git a/sid/component/cgen-cpu/arm7t/arm7f.cxx b/sid/component/cgen-cpu/arm7t/arm7f.cxx
index 6497f99..d78b50b 100644 (file)
--- a/sid/component/cgen-cpu/arm7t/arm7f.cxx
+++ b/sid/component/cgen-cpu/arm7t/arm7f.cxx
@@ -827,14 +827,6 @@ arm7f_cpu::memory_trap (const cpu_memory_fault& t)
   this->h_gr_set (H_GR_PC, t.pc);
   this->h_pc_set (t.pc);
 
-  if (this->debug_exec_p)
-    cerr << "MEMORY TRAP "
-        << " operation=" << t.operation
-        << " pc=0x" << hex << t.pc << dec
-        << " address=0x" << hex << t.address << dec
-        << " status=" << (int) t.status 
-        << endl;
-  
   cpu_trap_disposition whatnext = this->signal_trap (cpu_trap_memory_fault, t.address);
 
   switch (whatnext)
@@ -1033,7 +1025,7 @@ arm7f_cpu::arm_tbit_set (BI newval)
 
   this->hardware.h_tbit = newval;
 
-  if (this->debug_exec_p)
+  if (this->warnings_enabled)
     {
       if (newval)
        this->trace_stream << " <switching to thumb mode> ";

diff --git a/sid/component/cgen-cpu/arm7t/hw-cpu-arm7t.txt b/sid/component/cgen-cpu/arm7t/hw-cpu-arm7t.txt
index 4ba281c..6183fbc 100644 (file)
--- a/sid/component/cgen-cpu/arm7t/hw-cpu-arm7t.txt
+++ b/sid/component/cgen-cpu/arm7t/hw-cpu-arm7t.txt
@@ -8,7 +8,7 @@
   Pins: start-pc-set! endian-set!  reset!  nreset trap trap-code step!
         nm tbit nfiq nirq yield flush-icache step-cycles
   Accessors: data-memory insn-memory
-  Attributes: debug-exec? trace-extract?  trace-result?  engine-type
+  Attributes: enable-warnings? trace-extract?  trace-result?  engine-type
         insn-count step-insn-count enable-step-trap?  endian r0 r1 r2 r3 r4 r5 r6 r7 r8 r9
        r10 r11 r12 r13 r14 r15  pc cpsr cpsr-flags
         gdb-register-N gdb-num-registers gdb-exp-registers
@@ -195,7 +195,7 @@
 
   * attributes
 
-  debug-exec? | setting | boolean | false | initialization
+  enable-warnings? | setting | boolean | false | initialization
   trace-extract? | setting | boolean | false | initialization
   trace-result? | setting | boolean | false | initialization
   engine-type | setting | scache or pbb | pbb | execution