X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-bsd-os.c;h=a84336436fd36dc8d9cec0cf0035c6e73ac73cb9;hb=5e92e9ed61903658015c2a75c79a32ad41dbd29d;hp=beb902a25fd3a35476b424be9097c09a01e91cf2;hpb=7ff9e3f7f0d8b53a606a6f5769fc59512731984b;p=sbcl.git

diff --git a/src/runtime/x86-bsd-os.c b/src/runtime/x86-bsd-os.c
index beb902a..a843364 100644
--- a/src/runtime/x86-bsd-os.c
+++ b/src/runtime/x86-bsd-os.c
@@ -1,39 +1,42 @@
 #include <signal.h>
+#include "sbcl.h"
+#include "runtime.h"
 #include "target-os.h"
 
 /* KLUDGE: There is strong family resemblance in the signal context
  * stuff in FreeBSD and OpenBSD, but in detail they're different in
  * almost every line of code. It would be nice to find some way to
  * factor out the commonality better; failing that, it might be best
- * just to split this generic-BSD code into one variant for each BSD. 
+ * just to split this generic-BSD code into one variant for each BSD.
  *
  * KLUDGE II: this split has begun with the addition of the Darwin BSD
  * flavour, with the cross-architecture complications that this
  * entails; unfortunately, currently the situation is worse, not
  * better, than in the above paragraph. */
-   
+
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 int *
 os_context_register_addr(os_context_t *context, int offset)
 {
     switch(offset) {
     case  0:
-	return CONTEXT_ADDR_FROM_STEM(eax);
+        return CONTEXT_ADDR_FROM_STEM(eax);
     case  2:
-	return CONTEXT_ADDR_FROM_STEM(ecx);
+        return CONTEXT_ADDR_FROM_STEM(ecx);
     case  4:
-	return CONTEXT_ADDR_FROM_STEM(edx);
+        return CONTEXT_ADDR_FROM_STEM(edx);
     case  6:
-	return CONTEXT_ADDR_FROM_STEM(ebx);
+        return CONTEXT_ADDR_FROM_STEM(ebx);
     case  8:
-	return CONTEXT_ADDR_FROM_STEM(esp);
+        return CONTEXT_ADDR_FROM_STEM(esp);
     case 10:
-	return CONTEXT_ADDR_FROM_STEM(ebp);
+        return CONTEXT_ADDR_FROM_STEM(ebp);
     case 12:
-	return CONTEXT_ADDR_FROM_STEM(esi);
+        return CONTEXT_ADDR_FROM_STEM(esi);
     case 14:
-	return CONTEXT_ADDR_FROM_STEM(edi);
+        return CONTEXT_ADDR_FROM_STEM(edi);
     default:
-	return 0;
+        return 0;
     }
 }
 
@@ -43,8 +46,47 @@ os_context_sp_addr(os_context_t *context)
     return CONTEXT_ADDR_FROM_STEM(esp);
 }
 
+#endif /* __FreeBSD__ || __OpenBSD__ */
+
+#ifdef __NetBSD__
+int *
+os_context_register_addr(os_context_t *context, int offset)
+{
+    switch(offset) {
+    case  0:
+        return CONTEXT_ADDR_FROM_STEM(EAX);
+    case  2:
+        return CONTEXT_ADDR_FROM_STEM(ECX);
+    case  4:
+        return CONTEXT_ADDR_FROM_STEM(EDX);
+    case  6:
+        return CONTEXT_ADDR_FROM_STEM(EBX);
+    case  8:
+        return CONTEXT_ADDR_FROM_STEM(ESP);
+    case 10:
+        return CONTEXT_ADDR_FROM_STEM(EBP);
+    case 12:
+        return CONTEXT_ADDR_FROM_STEM(ESI);
+    case 14:
+        return CONTEXT_ADDR_FROM_STEM(EDI);
+    case 16:
+        return CONTEXT_ADDR_FROM_STEM(UESP);
+    default:
+        return 0;
+    }
+}
+
+int *
+os_context_sp_addr(os_context_t *context)
+{
+    return &(_UC_MACHINE_SP(context));
+}
+
+#endif  /* __NetBSD__ */
+
+
 
-/* FIXME: If this can be a no-op on BSD/x86, then it 
+/* FIXME: If this can be a no-op on BSD/x86, then it
  * deserves a more precise name.
  *
  * (Perhaps os_prepare_data_area_to_be_executed()?) */