Changeset 5639

Timestamp:

Dec 29, 2006, 12:32:35 AM (18 years ago)

Author:

Gary Byers

Message:

Don't remap ppc64 spjump table if it's already where it should be.

File:

• trunk/ccl/lisp-kernel/pmcl-kernel.c (modified) (3 diffs)

trunk/ccl/lisp-kernel/pmcl-kernel.c

@@ -1221 +1221 @@
 {
   extern opcode spjump_start, spjump_end;
-  pc new = mmap((pc) 0x5000,
-                0x1000,
-                PROT_READ | PROT_WRITE | PROT_EXEC,
-                MAP_PRIVATE | MAP_ANON | MAP_FIXED,
-                -1,
-                0),
+  pc new,
     old = &spjump_start,
     limit = &spjump_end,
@@ -1234 +1229 @@
   int disp;
   
-  if (new != (pc) 0x5000) {
-    _exit(1);
-  }
-  
-  for (work = new; old < limit; work++, old++) {
-    instr = *old;
-    disp = instr & ((1<<26)-1);
-    target = (void*)old+disp;
-    disp = target-(void *)work;
-    *work = ((instr >> 26) << 26) | disp;
-  }
-  xMakeDataExecutable(new, (void*)work-(void*)new);
-  mprotect(new, 0x1000, PROT_READ | PROT_EXEC);
+  if (old != (pc)0x5000) {
+    new = mmap((pc) 0x5000,
+               0x1000,
+               PROT_READ | PROT_WRITE | PROT_EXEC,
+               MAP_PRIVATE | MAP_ANON | MAP_FIXED,
+               -1,
+               0);
+    if (new != (pc) 0x5000) {
+      _exit(1);
+    }
+    
+    for (work = new; old < limit; work++, old++) {
+      instr = *old;
+      disp = instr & ((1<<26)-1);
+      target = (void*)old+disp;
+      disp = target-(void *)work;
+      *work = ((instr >> 26) << 26) | disp;
+    }
+    xMakeDataExecutable(new, (void*)work-(void*)new);
+    mprotect(new, 0x1000, PROT_READ | PROT_EXEC);
+  }
 }
 #endif
@@ -1692 +1695 @@
     error = dlerror();
     *resultType = 0;
-    return error;
+    return (void *)error;
   }
   *resultType = 1;