Changes for ARMv8 on aarch64-linux-gnu.

Get the platform defines right:
	if __linux__ && (defined(__arm64__) || defined(__aarch64__))
Include cogitARMv8.c in the files to be included by cogit.c (only for one
configuration for now; there are serious self-modifying code permission problems
to be solved before an ARMv8 JIT can be realized).
Configure the  build.linux64ARMv8/squeak.cog.spur builds correctly; we should
*NOT* manually define platform defines; these are to be left up to the native
compiler.  (I'll fix the stack builds soon).

Author: eliotmiranda

build.linux64ARMv8/squeak.cog.spur/build.assert/mvm

@@ -2,6 +2,7 @@
 set -e
 # assert Cog Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/sqspur64ARMv8linuxhtAssert
+MACHINE="-march=armv8.5-a -mtune=cortex-a72"
 OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
 
 if [ $# -ge 1 ]; then
@@ -17,11 +18,10 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-	--with-src=spur64src \
+	--with-vmversion=5.0 --with-src=spur64src \
 	--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-march=armv8-a" \
-	CFLAGS="$OPT -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__"
+	CFLAGS="$MACHINE $OPT -DCOGMTVM=0"
+
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`

build.linux64ARMv8/squeak.cog.spur/build.debug/mvm

@@ -2,6 +2,7 @@
 set -e
 # debug Cog Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=sqspur64ARMv8linuxhtDebug
+MACHINE="-march=armv8.5-a -mtune=cortex-a72"
 OPT="-g3 -O0 -DDEBUGVM=1"
 
 if [ $# -ge 1 ]; then
@@ -17,11 +18,10 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-	--with-src=spur64src \
+	--with-vmversion=5.0 --with-src=spur64src \
 	--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-march=armv8-a" \
-	CFLAGS="$OPT -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__"
+	CFLAGS="$MACHINE $OPT -DCOGMTVM=0"
+
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`

build.linux64ARMv8/squeak.cog.spur/build/mvm

@@ -2,7 +2,8 @@
 set -e
 # Cog Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=sqspur64ARMv8linuxht
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0"
+MACHINE="-march=armv8.5-a -mtune=cortex-a72"
+OPT="-g -O3 -DNDEBUG -DDEBUGVM=0"
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
@@ -17,11 +18,10 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-	--with-src=spur64src \
+	--with-vmversion=5.0 --with-src=spur64src \
 	--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-march=armv8-a" \
-	CFLAGS="$OPT -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__"
+	CFLAGS="$MACHINE $OPT -DCOGMTVM=0"
+
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`

platforms/unix/vm/sqUnixMain.c

@@ -1021,9 +1021,25 @@ printRegisterState(ucontext_t *uap)
 			regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15],
 			regs[REG_RIP]);
 	return (void *)regs[REG_RIP];
-# elif __linux__ && (defined(__arm64__))
- 	printf("@@FIXME@@: derive register state from a ucontext_t on aarch64 \n");
-	return 0;
+# elif __linux__ && (defined(__arm64__) || defined(__aarch64__))
+	unsigned long *regs = (unsigned long *)&uap->uc_mcontext.regs[0];
+	printf(	"\tx0 %p x1 %p x2 %p x3 %p\n"
+			"\tx4 %p x5 %p x6 %p x7 %p\n"
+			"\tx8 %p x9 %p x10 %p x11 %p\n"
+			"\tx12 %p x13 %p x14 %p x15 %p\n"
+			"\tx16 %p x17 %p x18 %p x19 %p\n"
+			"\tx20 %p x21 %p x22 %p x23 %p\n"
+			"\tx24 %p x25 %p x26 %p x27 %p\n"
+			"\tx29 %p  fp %p  lr %p  sp %p\n",
+			regs[0], regs[1], regs[2], regs[3],
+			regs[4], regs[5], regs[6], regs[7],
+			regs[8], regs[9], regs[10], regs[11],
+			regs[12], regs[13], regs[14], regs[15],
+			regs[16], regs[17], regs[18], regs[19],
+			regs[20], regs[21], regs[22], regs[23],
+			regs[24], regs[25], regs[26], regs[27],
+			regs[28], regs[29], regs[30], uap->uc_mcontext.sp);
+	return uap->uc_mcontext.pc;
 # elif __linux__ && (defined(__arm__) || defined(__arm32__) || defined(ARM32))
 	struct sigcontext *regs = &uap->uc_mcontext;
 	printf(	"\t r0 0x%08x r1 0x%08x r2 0x%08x r3 0x%08x\n"

platforms/unix/vm/sqUnixSpurMemory.c

@@ -129,7 +129,7 @@ sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress
 	delta = max(pageSize,1024*1024);
 
 	while ((unsigned long)(address + bytes) > (unsigned long)address) {
-		alloc = mmap(address, bytes, PROT_READ | PROT_WRITE,
+		alloc = mmap(address, bytes, PROT_READ | PROT_WRITE | PROT_EXEC,
 					 MAP_ANON | MAP_PRIVATE, -1, 0);
 		if (alloc == MAP_FAILED) {
 			mmapErrno = errno;

spur64src/vm/cogit.c

@@ -1,12 +1,12 @@
 /* Automatically generated by
-	Cogit VMMaker.oscog-eem.2596 uuid: 8500baf3-a5ae-4594-9f3b-08cedfdf1fb3
+	Cogit VMMaker.oscog-eem.2676 uuid: c506939b-d6f7-44a3-9ea3-97131756aa64
  */
 
 #if !SysV && !_WIN64
 # define SysV 1
 #endif
 
-#if defined(__ARM_ARCH_8__) || defined(__arm__) || defined(__arm64__) || defined(ARM64)
+#if defined(__arm64__) || defined(__aarch64__) || defined(__ARM_ARCH_ISA_A64) || defined(ARM64) || defined(ARMv8)
 
 #	include "cogitARMv8.c"