[Sablevm-developer] Bug#245834: Missing amd64 support.

[Andreas J. <aj...@an...>]

tags 245834 + patch

On 04-Apr-25 19:42, Kurt Roeckx wrote:
> It currently doesn't seem to have support for amd64.  Adding
> support for it seems mostly adding || defined(__x86_64__) where
> __i386__ is used, except for system.h where the word/allignment
> needs to be chagned from 32bit/4byte to 64bit/8byte.
> 
> I just don't know enough assembler/hardware details for the
> things in system.c

The attached patch seems to work for me.

Regards
Andreas Jochens


diff -urN ../tmp-orig/sablevm-1.1.3/src/libsablevm/include/jni_system_specific.h ./src/libsablevm/include/jni_system_specific.h
--- ../tmp-orig/sablevm-1.1.3/src/libsablevm/include/jni_system_specific.h	2004-04-12 20:29:07.000000000 +0000
+++ ./src/libsablevm/include/jni_system_specific.h	2004-05-01 20:42:28.402644600 +0000
@@ -20,6 +20,7 @@
     || defined (__i386__) || defined (__powerpc__) || defined (__s390__) \
     || defined (__hppa__) || defined (__arm__) || defined (__m68k__) \
     || defined (__mc68000__) || defined (__mips__) || defined (__mipsel__) \
+    || defined (__x86_64__) \
      ) && defined (__GNUC__))
 
 #define JNICALL
diff -urN ../tmp-orig/sablevm-1.1.3/src/libsablevm/system.c ./src/libsablevm/system.c
--- ../tmp-orig/sablevm-1.1.3/src/libsablevm/system.c	2004-04-12 20:29:08.000000000 +0000
+++ ./src/libsablevm/system.c	2004-05-01 20:54:17.985771568 +0000
@@ -18,6 +18,7 @@
     || defined (__i386__) || defined (__powerpc__) || defined (__s390__) \
     || defined (__hppa__) || defined (__arm__) || defined (__m68k__) \
     || defined (__mc68000__) || defined (__mips__) || defined (__mipsel__) \
+    || defined (__x86_64__) \
      ) && defined (__GNUC__))
 
 /*
@@ -346,6 +347,20 @@
                        : "memory");
 /* *INDENT-ON* */
 
+#elif defined (__x86_64__)
+
+  _svmt_word current_value;
+  _svmt_u8 result;
+
+/* *INDENT-OFF* */
+  __asm__ __volatile__ ("lock\n\t"
+			"cmpxchgq %3, %1\n\t"
+			"sete %0"
+			:"=q" (result), "=m" (*pword), "=a" (current_value)
+			:"r" (new_value), "m" (*pword), "a" (old_value)
+			:"memory");
+/* *INDENT-ON* */
+
 #else
 #error "SableVM is not prepared to run on this kind of a system; no atomic compare&swap defined."
 #endif
diff -urN ../tmp-orig/sablevm-1.1.3/src/libsablevm/system.h ./src/libsablevm/system.h
--- ../tmp-orig/sablevm-1.1.3/src/libsablevm/system.h	2004-04-12 20:29:08.000000000 +0000
+++ ./src/libsablevm/system.h	2004-05-01 20:53:12.493727872 +0000
@@ -54,6 +54,7 @@
     || defined (__i386__) || defined (__powerpc__) || defined (__s390__) \
     || defined (__hppa__) || defined (__arm__) || defined (__m68k__) \
     || defined (__mc68000__) || defined (__mips__) || defined (__mipsel__) \
+    || defined (__x86_64__) \
      ) && defined (__GNUC__))
 
 /* "inline" is now an official keyword since the latest C standard (1999).
@@ -231,6 +232,25 @@
 
 /* #include <inlined_i386-gcc-2.95.h> */
 
+#elif defined (__x86_64__)
+
+typedef _svmt_u64 _svmt_word;
+typedef _svmt_d64 _svmt_float_word;
+
+#define SVM_WORD_SIZE 8		/* size in bytes */
+#define SVM_WORD_BIT_COUNT 64	/* size in bits */
+
+/* see comments at the head of this file */
+#define SVM_ALIGNMENT 8
+#define SVM_ALIGNMENT_POWER 3	/* 2 ^^ SVM_ALIGNMENT_POWER == SVM_ALIGNMENT */
+#define SVM_PAGE_SIZE 4096
+
+#if   (GCC_VERSION >= 2095) && (GCC_VERSION <3000)
+#include <inlined_i386-gcc-2.95.h>
+#else
+#include <inlined_i386-gcc-3.3.h>
+#endif /* (GCC_VERSION >= 2095) && (GCC_VERSION <3000) */
+
 #else
 #error "unknown system"
 #endif