Changeset 6306 for branches

Timestamp:

Apr 18, 2007, 11:37:28 PM (18 years ago)

Author:

Gary Byers

Message:

Use new scheme for mapping from tra to containing fn.
Needs testing on a machine where gdb/xemacs work ...

Location:

branches/x8664-call/ccl/lisp-kernel

Files:

• x86-exceptions.c (modified) (1 diff)
• x86-exceptions.h (modified) (1 diff)
• x86-gc.c (modified) (3 diffs)
• x86_print.c (modified) (1 diff)
• xlbt.c (modified) (4 diffs)

branches/x8664-call/ccl/lisp-kernel/x86-exceptions.c

@@ -316 +316 @@
   tra = xpGPR(xp,Ira0);
   if (tag_of(tra) == tag_tra) {
-    tra_f = tra - ((int *)tra)[-1];
+    if ((*((unsigned short *)tra) == RECOVER_FN_FROM_RIP_WORD0) &&
+        (*((unsigned char *)(tra+2)) == RECOVER_FN_FROM_RIP_BYTE2)) {
+      int sdisp = (*(int *) (tra+3));
+      tra_f = RECOVER_FN_FROM_RIP_LENGTH+tra+sdisp;
+    }
     if (fulltag_of(tra_f) != fulltag_function) {
       tra_f = 0;

branches/x8664-call/ccl/lisp-kernel/x86-exceptions.h

@@ -151 +151 @@
 void setup_sigaltstack(area *);
 #endif
+
+/* recognizing the function associated with a tagged return address */
+/* now involves recognizinig an "(lea (@ disp (% rip)) (% rn))" */
+/* instruction at the tra */
+
+#define RECOVER_FN_FROM_RIP_LENGTH 7 /* the instruction is 7 bytes long */
+#define RECOVER_FN_FROM_RIP_DISP_OFFSET 3 /* displacement word is 3 bytes in */
+#define RECOVER_FN_FROM_RIP_WORD0 0x8d4c /* 0x4c 0x8d, little-endian */
+#define RECOVER_FN_FROM_RIP_BYTE2 0x2d  /* third byte of opcode */

branches/x8664-call/ccl/lisp-kernel/x86-gc.c

@@ -291 +291 @@
 
   if (tag_of(n) == tag_tra) {
-    n = n - (((int *)n)[-1]);
-    tag_n = fulltag_function;
+    if ((*((unsigned short *)n) == RECOVER_FN_FROM_RIP_WORD0) &&
+        (*((unsigned char *)(n+2)) == RECOVER_FN_FROM_RIP_BYTE2)) {
+      int sdisp = (*(int *) (n+3));
+      n = RECOVER_FN_FROM_RIP_LENGTH+n+sdisp;
+      tag_n = fulltag_function;
+    }
+    else {
+      return;
+    }
   }
 
@@ -456 +463 @@
 
   if (tag_of(n) == tag_tra) {
-    n -= ((int *)n)[-1];
-    tag_n = fulltag_function;    
+    if ((*((unsigned short *)n) == RECOVER_FN_FROM_RIP_WORD0) &&
+        (*((unsigned char *)(n+2)) == RECOVER_FN_FROM_RIP_BYTE2)) {
+      int sdisp = (*(int *) (n+3));
+      n = RECOVER_FN_FROM_RIP_LENGTH+n+sdisp;
+      tag_n = fulltag_function;
+    } else {
+      return;
+    }
   }
 
@@ -710 +723 @@
     if ((tag_n == fulltag_tra_0) ||
         (tag_n == fulltag_tra_1)) {
-      int disp = ((int *)n)[-1];
+      int disp = (*(int *) (n+3)) + RECOVER_FN_FROM_RIP_LENGTH;
 
       base = (LispObj *) (untag(n-disp));

branches/x8664-call/ccl/lisp-kernel/x86_print.c

@@ -317 +317 @@
 sprint_tra(LispObj o, int depth)
 {
-  unsigned disp = *(((unsigned *)o)-1);
-  LispObj f = o-disp;
+  signed sdisp;
+  unsigned disp;
+  LispObj f = 0;
+
+  if ((*((unsigned short *)o) == RECOVER_FN_FROM_RIP_WORD0) &&
+      (*((unsigned char *)(o+2)) == RECOVER_FN_FROM_RIP_BYTE2)) {
+    sdisp = (*(int *) (o+3));
+    f = RECOVER_FN_FROM_RIP_LENGTH+o+sdisp;
+    disp = o-f;
+  }
 
   if (fulltag_of(f) == fulltag_function) {

branches/x8664-call/ccl/lisp-kernel/xlbt.c

@@ -27 +27 @@
 print_lisp_frame(lisp_frame *frame)
 {
-  LispObj pc = frame->tra, fun;
+  LispObj pc = frame->tra, fun=0;
   int delta = 0;
 
@@ -34 +34 @@
   }
   if (tag_of(pc) == tag_tra) {
-    fun = pc - (((unsigned *)pc)[-1]);
+    if ((*((unsigned short *)pc) == RECOVER_FN_FROM_RIP_WORD0) &&
+        (*((unsigned char *)(pc+2)) == RECOVER_FN_FROM_RIP_BYTE2)) {
+      int sdisp = (*(int *) (pc+3));
+      fun = RECOVER_FN_FROM_RIP_LENGTH+pc+sdisp;
+    }
     if (fulltag_of(fun) == fulltag_function) {
       delta = pc - fun;
@@ -53 +57 @@
   LispObj fun, ra;
   unsigned offset;
+  int sdisp;
 
   if (f) {
@@ -59 +64 @@
       ra = f->xtra;
     }
+
     if (tag_of(ra) == tag_tra) {
-      offset = (((unsigned *)ra)[-1]);
-      if (offset == 0) {
-        return true;
-      } else {
-        fun = ra - (((unsigned *)ra)[-1]);
-        if (fulltag_of(fun) == fulltag_function) {
-          return true;
-        }
+      if ((*((unsigned short *)ra) == RECOVER_FN_FROM_RIP_WORD0) &&
+          (*((unsigned char *)(ra+2)) == RECOVER_FN_FROM_RIP_BYTE2)) {
+        sdisp = (*(int *) (ra+3));
+        fun = RECOVER_FN_FROM_RIP_LENGTH+ra+sdisp;
+      }
+      if (fulltag_of(fun) == fulltag_function) {
+        return true;
       }
     } else if ((ra == lisp_global(LEXPR_RETURN)) ||