Skip to content

Commit

Permalink
Fix win64 x64 compilation
Browse files Browse the repository at this point in the history
2 problems here:
- erroneous usage of asm directives
- it was necessary to republish SqueakFFIPrims for correction of WIN64 #ifdef
  • Loading branch information
nicolas-cellier-aka-nice committed Aug 11, 2016
1 parent fb67d23 commit 9005773
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions platforms/Cross/plugins/IA32ABI/x64win64ia32abicc.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,10 @@ thunkEntry(long long rcx, long long rdx,
_asm mov r8 , xmm2;
_asm mov r9 , xmm3;
#elif __GNUC__
asm("movq %%rcx,%%xmm0");
asm("movq %%rdx,%%xmm1");
asm("movq %%r8 ,%%xmm2");
asm("movq %%r9 ,%%xmm3");
asm("movq %rcx,%xmm0");
asm("movq %rdx,%xmm1");
asm("movq %r8 ,%xmm2");
asm("movq %r9 ,%xmm3");
#else
# error need to load edx with vmcc.rvs.valleint64.high on this compiler
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Automatically generated by
ThreadedFFIPlugin VMMaker.oscog-eem.1893 uuid: ed498bfa-0631-4cf2-8bfb-c49e20505d40
ThreadedFFIPlugin VMMaker.oscogLLP64-nice.1926 uuid: 0a431195-4bae-0e42-a1f5-5a17d010c24d
*/

#if defined(__ARM_ARCH__) || defined(__arm__) || defined(__arm32__) || defined(ARM32)
Expand All @@ -17,7 +17,7 @@
# define X64SysVFFIPlugin_exports SqueakFFIPrims_exports
# include "X64SysVFFIPlugin.c"

#elif defined(WIN64) && (!defined(WIN64) && (defined(x86_64) || defined(__amd64) || defined(__x86_64) || defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)))
#elif defined(WIN64) && (defined(x86_64) || defined(__amd64) || defined(__x86_64) || defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))

# define X64Win64FFIPlugin_exports SqueakFFIPrims_exports
# include "X64Win64FFIPlugin.c"
Expand Down

0 comments on commit 9005773

Please sign in to comment.