Changeset 16083

Timestamp:

May 25, 2014, 8:39:48 PM (5 years ago)

Author:

gb

Message:

Propagate r15802 from trunk. Fixes ticket:1190

Location:

release/1.9/source/lisp-kernel

Files:

• arm-asmutils.s (modified) (1 diff)
• arm-exceptions.c (modified) (1 diff)
• arm-exceptions.h (modified) (1 diff)
• pmcl-kernel.c (modified) (2 diffs)

release/1.9/source/lisp-kernel/arm-asmutils.s

@@ -217 +217 @@
 _endfn                        
                                 
+_exportfn(C(feature_check))
+        .globl C(feature_check_ldrex)
+        .globl C(feature_check_clrex)
+        .globl C(feature_check_fpu)
+C(feature_check_fpu):           
+        __(fcmpd d15,d15)
+C(feature_check_ldrex): 
+        __(ldrex r2,[sp])
+C(feature_check_clrex):         
+        __(.long 0xf57ff01f)    /* clrex */
+        __(bx lr)
+_endfn        
         _endfile
 

release/1.9/source/lisp-kernel/arm-exceptions.c

@@ -2053 +2053 @@
 
 
+
+
+void
+early_signal_handler(int signum, siginfo_t *info, ExceptionInformation  *context)
+{
+  extern pc feature_check_fpu,feature_check_ldrex,feature_check_clrex;
+  extern int arm_architecture_version;
+  
+  if ((xpPC(context) == feature_check_fpu) ||
+      (xpPC(context) == feature_check_ldrex)) {
+    arm_architecture_version = 5;
+  } else {
+    arm_architecture_version = 6;
+  }
+  xpPC(context) = xpLR(context);
+}

release/1.9/source/lisp-kernel/arm-exceptions.h

@@ -165 +165 @@
 void
 normalize_tcr(ExceptionInformation *,TCR *, Boolean);
+
+void
+install_signal_handler(int, void*, unsigned);

release/1.9/source/lisp-kernel/pmcl-kernel.c

@@ -1580 +1580 @@
 #ifdef ARM
 int
-arm_architecture_version = 0;
+arm_architecture_version = 7;
 
 Boolean
@@ -1587 +1587 @@
   Boolean win = false;
 #ifdef LINUX
-/* It's hard to determine ARM features in general, and especially
-   hard to do so from user mode.  Parse /proc/cpuinfo. 
-   According to Android's cpufeatures library, some ARMv6 chips
-   are reported to have archutecture version 7; check the ELF
-   architecture in this case.
-
-   (In other words, we assume that we're on ARMv7 or later if
-   the reported architecture is > 7, or if it's = 7 and the 
-   ELF architecture is "v7l".)
-*/
-  FILE *f = fopen("/proc/cpuinfo", "r");
-  char *procline = NULL, *cpuline = NULL, line[129], *workline;
-  size_t n;
-
-  if (f) {
-    while (1) {
-      if (fgets(line,128,f)==NULL) {
-        break;
-      }
-      n = strlen(line);
-      if (strncmp(line,"Processor",sizeof("Processor")-1) == 0) {
-        procline = malloc(n+1);
-        strcpy(procline,line);
-        procline[n]='\0';
-      } else if (strncmp(line, "CPU architecture",sizeof("CPU architecture")-1) == 0) {
-        cpuline = malloc(n+1);
-        strcpy(cpuline,line);
-        cpuline[n] = '\0';
-      }
-    }
-    if (procline) {
-      win = (strstr(procline, "v7l") != NULL);
-      if (win) {
-        arm_architecture_version = 7;
-      } else {
-        win = (strstr(procline, "v6l") != NULL);
-        if (win) {
-          arm_architecture_version = 6;
-        } else {
-          if (cpuline) {
-            workline = index(cpuline,':');
-            if (workline) {
-              arm_architecture_version = strtol(workline+1,NULL,0);
-              if (arm_architecture_version >= ARM_ARCHITECTURE_min) {
-                win = true;
-              }
-            }
-          }
-        }
-      }
-    }
-    if (procline) {
-      free(procline);
-    }
-    if (cpuline) {
-      free(cpuline);
-    }
-    fclose(f);
-  }
+  extern void feature_check(), early_signal_handler();
+
+  install_signal_handler(SIGILL, (void *)early_signal_handler,0);
+  feature_check();
+  win = arm_architecture_version >= 6;
+  install_signal_handler(SIGILL, NULL, 0);
+
 #endif
   return win;