Portage Cray T3E

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1996 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

byterun/interp.c

@@ -109,11 +109,18 @@ sp is a local copy of the global variable extern_sp. */
 #define ACCU_REG asm("%l2")
 #endif
 #ifdef __alpha__
+#ifdef __CRAY__
+#define PC_REG asm("r9")
+#define SP_REG asm("r10")
+#define ACCU_REG asm("r11")
+#define JUMPTBL_BASE_REG asm("r12")
+#else
 #define PC_REG asm("$9")
 #define SP_REG asm("$10")
 #define ACCU_REG asm("$11")
 #define JUMPTBL_BASE_REG asm("$12")
 #endif
+#endif
 #ifdef __i386__
 #define PC_REG asm("%esi")
 #define SP_REG asm("%edi")

byterun/str.c

@@ -92,10 +92,18 @@ value fill_string(value s, value offset, value len, value init) /* ML */
   return Val_unit;
 }
 
-static unsigned char printable_chars_ascii[] = /* 0x20-0x7E */
-  "\000\000\000\000\377\377\377\377\377\377\377\377\377\377\377\177\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000";
-static unsigned char printable_chars_iso[] = /* 0x20-0x7E 0xA1-0xFF */
-  "\000\000\000\000\377\377\377\377\377\377\377\377\377\377\377\177\000\000\000\000\376\377\377\377\377\377\377\377\377\377\377\377";
+static unsigned char printable_chars_ascii[] = { /* 0x20-0x7E */
+  0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0
+};
+static unsigned char printable_chars_iso[] = { /* 0x20-0x7E 0xA1-0xFF */
+  0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F,
+  0, 0, 0, 0, 0xFE, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
 
 value is_printable(value chr) /* ML */
 {

configure

@@ -163,6 +163,9 @@ case "$bytecc,$host" in
     # (For those who want to force "cc -64")
     # Turn off warning "unused library"
     bytecclinkopts="-Wl,-woff,84";;
+  *,alpha-*-unicos*)
+    # For the Cray T3E
+    bytecccompopts="-DUMK";;
 esac
 
 # Configure compiler to use in further tests