Merge branch 'dev' of github.com:kristjanvalur/stackman into dev

Author: kristjanvalur

.gitignore

@@ -42,14 +42,6 @@
 *.idb
 *.pdb
 
-# Kernel Module Compile Results
-*.mod*
-*.cmd
-.tmp_versions/
-modules.order
-Module.symvers
-Mkfile.old
-dkms.conf
 
 # custom
 bin/

.travis.yml

@@ -0,0 +1,40 @@
+language: c
+dist: bionic
+script: make && make test
+jobs:
+  include:
+    - name: x86_64_gcc
+    - name: x86_gcc
+      before_install: sudo apt install -y gcc-multilib g++-multilib
+      env: PLATFORMFLAGS=-m32
+    - arch: arm64
+    - name: arm32_xcompile
+      before_install:
+        - sudo apt update
+        - sudo apt install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
+        - sudo apt install -y qemu-user
+      env: 
+        - PLATFORM_PREFIX=arm-linux-gnueabi-
+        - EMULATOR=qemu-arm
+    - os: windows
+      name: x64_msvc
+      script:
+        - cd vs2017
+        - ./build.cmd x64 && x64/Debug/test.exe
+    - os: windows
+      name: x86_msvc
+      script:
+        - cd vs2017
+        - ./build.cmd x86 && Win32/Debug/test.exe
+    - os: windows
+      name: arm_msvc
+      before_install: choco install --force VisualStudio2017-workload-vctools --params"--add Microsoft.VisualStudio.Component.VC.Tools.ARM"
+      script:
+        - cd vs2017
+        - ./build.cmd ARM
+    - os: windows
+      name: arm64_msvc
+      before_install: choco install --force VisualStudio2017-workload-vctools --params"--add Microsoft.VisualStudio.Component.VC.Tools.ARM64"
+      script:
+        - cd vs2017
+        - ./build.cmd ARM64

Makefile

@@ -1,15 +1,22 @@
 
 
-CPPFLAGS += -Isrc $(PLATFORM)
-CFLAGS += -fPIC -g $(PLATFORM)
-CXXFLAGS += -fPIC -g $(PLATFORM)
-LDFLAGS += -L$(LIB) -g $(PLATFORM)
+CPPFLAGS += -Isrc $(PLATFORMFLAGS)
+CFLAGS += -fPIC -g $(PLATFORMFLAGS)
+CXXFLAGS += -fPIC -g $(PLATFORMFLAGS)
+LDFLAGS += -L$(LIB) -g $(PLATFORMFLAGS)
 
 # add flag to disable Intel CET
 NO_CET := $(shell ./disable_cet $(CC))
 CFLAGS += $(NO_CET)
 CXXFLAGS += $(NO_CET)
 
+OLDCC := $(CC)
+ifdef PLATFORM_PREFIX
+CC = $(PLATFORM_PREFIX)gcc
+CXX = $(PLATFORM_PREFIX)g++
+LD = $(PLATFORM_PREFIX)ld
+AR = $(PLATFORM_PREFIX)ar
+endif
 # run c preprocessor with any cflags to get cross compilation result, then run regular compile in native
 ABI := $(shell ./abiname.sh "$(CC)" "$(CFLAGS)")
 ifndef ABI
@@ -41,10 +48,10 @@ DEBUG = #-DDEBUG_DUMP
 .PHONY: test tests
 
 test: tests
-	bin/test
-	bin/test_cc
-	bin/test_static
-	bin/test_asm
+	$(EMULATOR) bin/test
+	$(EMULATOR) bin/test_cc
+	$(EMULATOR) bin/test_static
+	$(EMULATOR) bin/test_asm
 	@echo "*** All test suites passed ***"
 
 tests: bin/test
@@ -54,13 +61,13 @@ tests: bin/test_asm
 tests: LDLIBS := -lstackman
 
 bin/test: tests/test.o $(LIB)/libstackman.a
-	$(CC) $(LDFLAGS) -o $@ $< ${DEBUG} $(LDLIBS)
+	$(CC) $(LDFLAGS) -static -o $@ $< ${DEBUG} $(LDLIBS)
 
 bin/test_cc: tests/test_cc.o $(LIB)/libstackman.a
-	$(CXX) $(LDFLAGS) -o $@ $< ${DEBUG} $(LDLIBS)
+	$(CXX) $(LDFLAGS) -static -o $@ $< ${DEBUG} $(LDLIBS)
 
 bin/test_static: tests/test_static.o
-	$(CC) $(LDFLAGS) -o $@ $^ ${DEBUG}
+	$(CC) $(LDFLAGS) -static -o $@ $^ ${DEBUG}
 
 bin/test_asm: tests/test_asm.o tests/test_asm_s.o
-	$(CC) $(LDFLAGS) -o $@ $^ ${DEBUG}
+	$(CC) $(LDFLAGS) -static -o $@ $^ ${DEBUG}

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/kristjanvalur/stackman.svg?branch=master)](https://travis-ci.org/kristjanvalur/stackman)
+
 # stackman
 Simple low-level stack manipulation API and implementation for common platforms
 
@@ -119,4 +121,21 @@ src/platform/gen_asm.c
 
 The x86 tools require the **gcc-multilib** and **g++-multilib** packages to be installed.  They, however, can't co-exist with the **gcc-arm-linux-gnueabi** or
 **gcc-aarch64-linux-gnu** packages on some distributions, and so development for these
-platforms may need to be done independently.
+platforms may need to be done independently.
+
+### Cross compiling for x86 (32 bit) on Linux
+ - install __gcc-multilib__ and __g++-multilib__
+ - *compile* **gen_asm.c** using `gcc -m32`
+ - *make* using  `make PLATFORMFLAGS=-m32  test`
+
+### Cross compiling for ARM (32 bit) on Linux
+ - install __gcc-arm-linux-gnueabi__ and __g++-arm-linux-gnueabi__
+ - install __qemu-user__ for hardware emulation 
+ - *compile* **gen_asm.c** using `arm-linux-gnueabi-gcc`
+ - *make* using  `make PLATFORM_PREFIX=arm-linux-gnueabi- EMULATOR=qemu-arm test`
+
+### Cross compiling for Arm64 on Linux
+ - install **gcc-aarch64-linux-gnu** and **g++-aarch64-linux-gnu**
+ - install __qemu-user__ for hardware emulation 
+ - *compile* using `aarch64-linux-gnu-gcc`
+ - *make* using `make PLATFORM_PREFIX=aarch64-linux-gnu- EMULATOR=qemu-arm64 test`

lib/aarch64/libstackman.a

@@ -64,7 +64,6 @@ void *STACKMAN_SWITCH_INASM_NAME(stackman_cb_t callback, void *context)
 	sp = callback(context, STACKMAN_OP_RESTORE, sp);
 	return sp;
 }
-#endif
 
 /* 
  * Similar, but we want the frame pointer so that a debugger
@@ -90,6 +89,8 @@ void *stackman_call(stackman_cb_t callback, void *context, void *stack_pointer)
   return result;
 }
 
+#endif
+
 #if __ASSEMBLER__ && defined(STACKMAN_ASSEMBLY_SRC)
 /* pre-generated assembly code */
 #include STACKMAN_ASSEMBLY_SRC

lib/arm32/libstackman.a

@@ -13,21 +13,21 @@
 	; args "callback", "context" are in x0, x1
 	; push non-volatile x18-x28 registers, in addition to fp,rl pair.
 	; x29 is fp, x30 is lr.
-	stp	x29, x30, [sp, -176]!	; store fp,lr pair, allocate stack space
+	stp	x29, x30, [sp, #-176]!	; store fp,lr pair, allocate stack space
 	mov	x29, sp					; and set fp pointing to old fp on stack
 	; push non-volatile registers 18-x28 and fp regs d8-d15)
 	; also  fpcr (fp control register)
 	mrs    x2,fpcr
-	stp	x2,  x18, [sp, 16]
-	stp	x19, x20, [sp, 32]
-	stp	x21, x22, [sp, 48]
-	stp	x23, x24, [sp, 64]
-	stp	x25, x26, [sp, 80]
-	stp	x27, x28, [sp, 96]
-	stp	d8,  d9,  [sp, 112]
-	stp	d10, d11, [sp, 128]
-	stp	d12, d13, [sp, 144]
-	stp	d14, d15, [sp, 160]
+	stp	x2,  x18, [sp, #16]
+	stp	x19, x20, [sp, #32]
+	stp	x21, x22, [sp, #48]
+	stp	x23, x24, [sp, #64]
+	stp	x25, x26, [sp, #80]
+	stp	x27, x28, [sp, #96]
+	stp	d8,  d9,  [sp, #112]
+	stp	d10, d11, [sp, #128]
+	stp	d12, d13, [sp, #144]
+	stp	d14, d15, [sp, #160]
 
 	; args are x0=callback, x1=context
 	; shuffle calling arguments into r0, r1 and r2
@@ -50,19 +50,19 @@
 	blr	x18     ;second callback
 
 	; restore registers from stack
-	ldp	x2,  x18, [sp, 16]
-	ldp	x19, x20, [sp, 32]
-	ldp	x21, x22, [sp, 48]
-	ldp	x23, x24, [sp, 64]
-	ldp	x25, x26, [sp, 80]
-	ldp	x27, x28, [sp, 96]
-	ldp	d8,  d9,  [sp, 112]
-	ldp	d10, d11, [sp, 128]
-	ldp	d12, d13, [sp, 144]
-	ldp	d14, d15, [sp, 160]
-	msr    fpcr,x2
+	ldp	x2,  x18, [sp, #16]
+	ldp	x19, x20, [sp, #32]
+	ldp	x21, x22, [sp, #48]
+	ldp	x23, x24, [sp, #64]
+	ldp	x25, x26, [sp, #80]
+	ldp	x27, x28, [sp, #96]
+	ldp	d8,  d9,  [sp, #112]
+	ldp	d10, d11, [sp, #128]
+	ldp	d12, d13, [sp, #144]
+	ldp	d14, d15, [sp, #160]
+	msr    fpcr, x2
 	;return
-	ldp	x29, x30, [sp], 176
+	ldp	x29, x30, [sp], #176
 	ret
 	ENDP
 
@@ -72,10 +72,10 @@
 ; args "callback", "context" are in x0, x1
 	; push non-volatile x18-x28 registers, in addition to fp,rl pair.
 	; x29 is fp, x30 is lr.
-	stp	x29, x30, [sp, -32]!	; store fp,lr pair, allocate stack space
+	stp	x29, x30, [sp, #-32]!	; store fp,lr pair, allocate stack space
 	mov	x29, sp					; and set fp pointing to old fp on stack
 	; push non-volatile register 18
-	str	x18, [sp, 16]
+	str	x18, [sp, #16]
 	
 	; args are x0 = callback, x1 = context, x2=stack
 	mov	x3, x0
@@ -94,8 +94,8 @@
 	mov sp, x18
 
 	; return
-	ldr x18, [sp, 16]
-	ldp	x29, x30, [sp], 32
+	ldr x18, [sp, #16]
+	ldp	x29, x30, [sp], #32
 	ret
 	ENDP
 	

src/platforms/switch_aarch64_gcc.h

@@ -0,0 +1,4 @@
+rem Build with visualstudio2017buildtools
+echo Building %1
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\VsDevCmd.bat"
+msbuild stackman.sln /p:Platform=%1

src/platforms/switch_arm64_msvc.asm

@@ -0,0 +1,44 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30717.126
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BF7D0638-AC4F-4206-B426-66CDDD468281} = {BF7D0638-AC4F-4206-B426-66CDDD468281}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stackman", "stackman\stackman.vcxproj", "{BF7D0638-AC4F-4206-B426-66CDDD468281}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}.Debug|ARM.ActiveCfg = Debug|ARM
+		{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}.Debug|ARM.Build.0 = Debug|ARM
+		{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}.Debug|ARM64.Build.0 = Debug|ARM64
+		{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}.Debug|x64.ActiveCfg = Debug|x64
+		{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}.Debug|x64.Build.0 = Debug|x64
+		{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}.Debug|x86.ActiveCfg = Debug|Win32
+		{CAFDBD3E-9D0D-4E90-BB6D-6C2A19F5EF53}.Debug|x86.Build.0 = Debug|Win32
+		{BF7D0638-AC4F-4206-B426-66CDDD468281}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BF7D0638-AC4F-4206-B426-66CDDD468281}.Debug|ARM.Build.0 = Debug|ARM
+		{BF7D0638-AC4F-4206-B426-66CDDD468281}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{BF7D0638-AC4F-4206-B426-66CDDD468281}.Debug|ARM64.Build.0 = Debug|ARM64
+		{BF7D0638-AC4F-4206-B426-66CDDD468281}.Debug|x64.ActiveCfg = Debug|x64
+		{BF7D0638-AC4F-4206-B426-66CDDD468281}.Debug|x64.Build.0 = Debug|x64
+		{BF7D0638-AC4F-4206-B426-66CDDD468281}.Debug|x86.ActiveCfg = Debug|Win32
+		{BF7D0638-AC4F-4206-B426-66CDDD468281}.Debug|x86.Build.0 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A71982F0-A89C-45AB-9F23-149A1983A11B}
+	EndGlobalSection
+EndGlobal