ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #157 from rth7680/x86

Browse Source 
Two fixes for x86
This commit is contained in:
Anthony Green
2014-12-12 10:13:56 -05:00
parent 8a3a2723aa 2f65246968
commit 75b2199f26
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/x86/ffi64.c
View File

@@ -233,6 +233,7 @@ classify_argument (ffi_type *type, enum x86_64_reg_class classes[],
signalize memory class, so handle it as special case. */ signalize memory class, so handle it as special case. */
if (!words) if (!words)
{ {
case FFI_TYPE_VOID:
classes[0] = X86_64_NO_CLASS; classes[0] = X86_64_NO_CLASS;
return 1; return 1;
} }
@@ -611,6 +612,9 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
{ {
switch (classes[j]) switch (classes[j])
{ {
case X86_64_NO_CLASS:
case X86_64_SSEUP_CLASS:
break;
case X86_64_INTEGER_CLASS: case X86_64_INTEGER_CLASS:
case X86_64_INTEGERSI_CLASS: case X86_64_INTEGERSI_CLASS:
/* Sign-extend integer arguments passed in general /* Sign-extend integer arguments passed in general

4
src/x86/sysv.S
View File

@@ -108,7 +108,7 @@ ffi_call_i386:
movl 12(%ebp), %ecx /* load return type code */ movl 12(%ebp), %ecx /* load return type code */
movl %ebx, 8(%ebp) /* preserve %ebx */ movl %ebx, 8(%ebp) /* preserve %ebx */
cfi_rel_offset(%ebp, 8) cfi_rel_offset(%ebx, 8)
andl $X86_RET_TYPE_MASK, %ecx andl $X86_RET_TYPE_MASK, %ecx
#ifdef __PIC__ #ifdef __PIC__
@@ -600,7 +600,7 @@ C(ffi_closure_raw_THISCALL):
subl $raw_closure_T_FS, %esp subl $raw_closure_T_FS, %esp
cfi_adjust_cfa_offset(raw_closure_T_FS) cfi_adjust_cfa_offset(raw_closure_T_FS)
movl %ebx, raw_closure_T_FS-4(%esp) movl %ebx, raw_closure_T_FS-4(%esp)
cfi_offset(%ebx, raw_closure_T_FS-4) cfi_rel_offset(%ebx, raw_closure_T_FS-4)
movl FFI_TRAMPOLINE_SIZE+8(%eax), %edx /* load cl->user_data */ movl FFI_TRAMPOLINE_SIZE+8(%eax), %edx /* load cl->user_data */
movl %edx, 12(%esp) movl %edx, 12(%esp)