From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 11 Jan 2007 06:57:40 +0000 (+0000)
Subject: Don't call bx_gdbstub_exception when we're not compiling the gdb stub.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e1ff2edf63096a8ce642cc727564074cdc7740;p=pintos-anon

Don't call bx_gdbstub_exception when we're not compiling the gdb stub.
Thanks to Godmar Back for pointing this out.
---

diff --git a/src/misc/bochs-2.2.6-page-fault-segv.patch b/src/misc/bochs-2.2.6-page-fault-segv.patch
index 81e59a7..7c61a37 100644
--- a/src/misc/bochs-2.2.6-page-fault-segv.patch
+++ b/src/misc/bochs-2.2.6-page-fault-segv.patch
@@ -2,11 +2,14 @@ Index: bochs-2.2.6/cpu/exception.cc
 diff -u bochs-2.2.6/cpu/exception.cc\~ bochs-2.2.6/cpu/exception.cc
 --- bochs-2.2.6/cpu/exception.cc~ 2006-09-28 15:51:39.000000000 -0700
 +++ bochs-2.2.6/cpu/exception.cc 2006-12-08 11:14:33.000000000 -0800
-@@ -1033,6 +1033,7 @@ void BX_CPU_C::exception(unsigned vector
+@@ -1033,6 +1033,10 @@ void BX_CPU_C::exception(unsigned vector
      BX_CPU_THIS_PTR curr_exception[0] = exception_type;
    }
  
++#if BX_GDBSTUB
 +  bx_gdbstub_exception(vector);
++#endif
++
  #if BX_CPU_LEVEL >= 2
    if (!real_mode()) {
      BX_CPU_THIS_PTR interrupt(vector, 0, push_error, error_code);