forked from pyodide/pyodide
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ENH Add Ctypes support (pyodide#1656)
- Loading branch information
Hood Chatham
authored
Jun 26, 2021
1 parent
450a2d2
commit 653891b
Showing
22 changed files
with
237 additions
and
191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| From 3f11694d7587e782530118d176306eeb6eebf5d1 Mon Sep 17 00:00:00 2001 | ||
| From: Hood <hood@mit.edu> | ||
| Date: Wed, 23 Jun 2021 13:47:30 -0700 | ||
| Subject: [PATCH] Don't dereference function pointer | ||
|
|
||
| Ctypes thinks that the result of dlsym is a pointer to the function pointer, so | ||
| it should call it like `result = (*f)(args)`. Probably this is true for the | ||
| native dlsym, but our dlsym returns an index into the indirect call table | ||
| "wasmTable", in particular it isn't even aligned like a pointer should be. | ||
| This patch fixes it so that it calls it like `result = f(args)` instead. | ||
|
|
||
| --- | ||
| Modules/_ctypes/_ctypes.c | 6 +++++- | ||
| 1 file changed, 5 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c | ||
| index ceae67e..44f2d76 100644 | ||
| --- a/Modules/_ctypes/_ctypes.c | ||
| +++ b/Modules/_ctypes/_ctypes.c | ||
| @@ -771,7 +771,11 @@ CDataType_in_dll(PyObject *type, PyObject *args) | ||
| return NULL; | ||
| } | ||
| #endif | ||
| - return PyCData_AtAddress(type, address); | ||
| + CDataObject *ob = (CDataObject *)GenericPyCData_new(type, NULL, NULL); | ||
| + if (ob == NULL) | ||
| + return NULL; | ||
| + *(void **)ob->b_ptr = address; | ||
| + return (PyObject*)ob; | ||
| } | ||
|
|
||
| static const char from_param_doc[] = | ||
| -- | ||
| 2.17.1 | ||
|
|
49 changes: 49 additions & 0 deletions
49
cpython/patches/remove-duplicate-symbols-from-cfield.c.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| From fc3b69f9afa779185a60834cf1817c22706edcd1 Mon Sep 17 00:00:00 2001 | ||
| From: Hood <hood@mit.edu> | ||
| Date: Tue, 22 Jun 2021 20:12:45 -0700 | ||
| Subject: [PATCH] Remove duplicate symbols from cfield.c | ||
|
|
||
| These symbols are already defined by libffi. | ||
| --- | ||
| Modules/_ctypes/cfield.c | 26 -------------------------- | ||
| 1 file changed, 26 deletions(-) | ||
|
|
||
| diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c | ||
| index 7ebd4ba..7a63ab7 100644 | ||
| --- a/Modules/_ctypes/cfield.c | ||
| +++ b/Modules/_ctypes/cfield.c | ||
| @@ -1635,31 +1635,5 @@ typedef struct _ffi_type | ||
| } ffi_type; | ||
| */ | ||
|
|
||
| -/* align and size are bogus for void, but they must not be zero */ | ||
| -ffi_type ffi_type_void = { 1, 1, FFI_TYPE_VOID }; | ||
| - | ||
| -ffi_type ffi_type_uint8 = { 1, 1, FFI_TYPE_UINT8 }; | ||
| -ffi_type ffi_type_sint8 = { 1, 1, FFI_TYPE_SINT8 }; | ||
| - | ||
| -ffi_type ffi_type_uint16 = { 2, 2, FFI_TYPE_UINT16 }; | ||
| -ffi_type ffi_type_sint16 = { 2, 2, FFI_TYPE_SINT16 }; | ||
| - | ||
| -ffi_type ffi_type_uint32 = { 4, INT_ALIGN, FFI_TYPE_UINT32 }; | ||
| -ffi_type ffi_type_sint32 = { 4, INT_ALIGN, FFI_TYPE_SINT32 }; | ||
| - | ||
| -ffi_type ffi_type_uint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_UINT64 }; | ||
| -ffi_type ffi_type_sint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_SINT64 }; | ||
| - | ||
| -ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT }; | ||
| -ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE }; | ||
| - | ||
| -#ifdef ffi_type_longdouble | ||
| -#undef ffi_type_longdouble | ||
| -#endif | ||
| - /* This is already defined on OSX */ | ||
| -ffi_type ffi_type_longdouble = { sizeof(long double), LONGDOUBLE_ALIGN, | ||
| - FFI_TYPE_LONGDOUBLE }; | ||
| - | ||
| -ffi_type ffi_type_pointer = { sizeof(void *), VOID_P_ALIGN, FFI_TYPE_POINTER }; | ||
|
|
||
| /*---------------- EOF ----------------*/ | ||
| -- | ||
| 2.17.1 | ||
|
|
65 changes: 65 additions & 0 deletions
65
cpython/patches/xfail-core-ctypes-tests-that-don-t-work.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| From a4aec920c76ebcb8360350ff0046c7a0c74c0cf2 Mon Sep 17 00:00:00 2001 | ||
| From: Hood <hood@mit.edu> | ||
| Date: Thu, 24 Jun 2021 14:55:10 -0700 | ||
| Subject: [PATCH] xfail core ctypes tests that don't work | ||
|
|
||
| PyCode_SetExtra doesn't work and ctypes doesn't seem to work with variadic functions including PyUnicode_FromFormat/ | ||
| --- | ||
| Lib/test/test_code.py | 7 +++++-- | ||
| Lib/test/test_unicode.py | 1 + | ||
| 2 files changed, 6 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py | ||
| index ac3dde7..d91a350 100644 | ||
| --- a/Lib/test/test_code.py | ||
| +++ b/Lib/test/test_code.py | ||
| @@ -389,6 +389,7 @@ if check_impl_detail(cpython=True) and ctypes is not None: | ||
| ctypes.c_voidp(100)), 0) | ||
|
|
||
| def test_free_called(self): | ||
| + raise unittest.SkipTest("PyCode_SetExtra is broken") | ||
| # Verify that the provided free function gets invoked | ||
| # when the code object is cleaned up. | ||
| f = self.get_func() | ||
| @@ -398,6 +399,7 @@ if check_impl_detail(cpython=True) and ctypes is not None: | ||
| self.assertEqual(LAST_FREED, 100) | ||
|
|
||
| def test_get_set(self): | ||
| + raise unittest.SkipTest("PyCode_SetExtra is broken") | ||
| # Test basic get/set round tripping. | ||
| f = self.get_func() | ||
|
|
||
| @@ -414,6 +416,7 @@ if check_impl_detail(cpython=True) and ctypes is not None: | ||
| del f | ||
|
|
||
| def test_free_different_thread(self): | ||
| + raise unittest.SkipTest("Requires threading") | ||
| # Freeing a code object on a different thread then | ||
| # where the co_extra was set should be safe. | ||
| f = self.get_func() | ||
| @@ -438,8 +441,8 @@ def test_main(verbose=None): | ||
| from test import test_code | ||
| run_doctest(test_code, verbose) | ||
| tests = [CodeTest, CodeConstsTest, CodeWeakRefTest] | ||
| - if check_impl_detail(cpython=True) and ctypes is not None: | ||
| - tests.append(CoExtra) | ||
| + # if check_impl_detail(cpython=True) and ctypes is not None: | ||
| + # tests.append(CoExtra) | ||
| run_unittest(*tests) | ||
|
|
||
| if __name__ == "__main__": | ||
| diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py | ||
| index 23508c5..a618e25 100644 | ||
| --- a/Lib/test/test_unicode.py | ||
| +++ b/Lib/test/test_unicode.py | ||
| @@ -2521,6 +2521,7 @@ class CAPITest(unittest.TestCase): | ||
|
|
||
| # Test PyUnicode_FromFormat() | ||
| def test_from_format(self): | ||
| + raise unittest.SkipTest("ctypes don't work with variadic C functions like PyUnicode_FromFormat") | ||
| support.import_module('ctypes') | ||
| from ctypes import ( | ||
| c_char_p, | ||
| -- | ||
| 2.17.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _osx_support.py | ||
| ctypes | ||
| curses | ||
| dbm | ||
| ensurepip | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
emsdk/patches/0001-Throw-away-errors-in-minify_wasm_js.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| From 310269ed630ead73e89e6bfc15e54e4c90959c95 Mon Sep 17 00:00:00 2001 | ||
| From: Hood <hood@mit.edu> | ||
| Date: Thu, 24 Jun 2021 04:08:02 -0700 | ||
| Subject: [PATCH] Throw away errors in minify_wasm_js | ||
|
|
||
| --- | ||
| emcc.py | 13 ++++++++----- | ||
| 1 file changed, 8 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/emsdk/upstream/emscripten/emcc.py b/emsdk/upstream/emscripten/emcc.py | ||
| index 839f791b3..5653470dd 100755 | ||
| --- a/emsdk/upstream/emscripten/emcc.py | ||
| +++ b/emsdk/upstream/emscripten/emcc.py | ||
| @@ -2901,11 +2901,14 @@ def do_binaryen(target, options, wasm_target): | ||
| # Closure can print out readable error messages (Closure will then | ||
| # minify whitespace afterwards) | ||
| save_intermediate_with_wasm('preclean', wasm_target) | ||
| - final_js = building.minify_wasm_js(js_file=final_js, | ||
| - wasm_file=wasm_target, | ||
| - expensive_optimizations=will_metadce(), | ||
| - minify_whitespace=minify_whitespace() and not options.use_closure_compiler, | ||
| - debug_info=intermediate_debug_info) | ||
| + try: | ||
| + final_js = building.minify_wasm_js(js_file=final_js, | ||
| + wasm_file=wasm_target, | ||
| + expensive_optimizations=will_metadce(), | ||
| + minify_whitespace=minify_whitespace() and not options.use_closure_compiler, | ||
| + debug_info=intermediate_debug_info) | ||
| + except: | ||
| + pass | ||
| save_intermediate_with_wasm('postclean', wasm_target) | ||
|
|
||
| if shared.Settings.ASYNCIFY_LAZY_LOAD_CODE: | ||
| -- | ||
| 2.17.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.