admin/icicle-emu-icicle-python
1
0
Fork 0
mirror of https://github.com/icicle-emu/icicle-python synced 2026-06-21 13:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch back to flat workspace

Browse Source 
https://github.com/PyO3/pyo3/issues/340 was since addressed
This commit is contained in:
Duncan Ogilvie
2025-10-23 12:16:50 +02:00
parent 100246fb7b
commit e326516b0e
11 changed files with 34 additions and 1237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.cargo/config.toml
+2
View File
@@ -0,0 +1,2 @@
[env]
GHIDRA_SRC = { value = "python/icicle", relative = true }
.python-version
+1
View File
@@ -0,0 +1 @@
3.8
Cargo.lock
Generated
+22 -38
View File
@@ -198,7 +198,7 @@ dependencies = [
"rustc-hash",
"serde",
"smallvec",
"target-lexicon 0.13.3",
"target-lexicon",
"wasmtime-internal-math",
]
@@ -247,7 +247,7 @@ dependencies = [
"cranelift-codegen",
"log",
"smallvec",
"target-lexicon 0.13.3",
"target-lexicon",
]
[[package]]
@@ -271,7 +271,7 @@ dependencies = [
"libc",
"log",
"region",
"target-lexicon 0.13.3",
"target-lexicon",
"wasmtime-internal-jit-icache-coherence",
"windows-sys 0.60.2",
]
@@ -295,7 +295,7 @@ checksum = "1c469bb98ffe9f38a1a5ada0427ab096f0f1b9a22a30149fc705205c56cf8985"
dependencies = [
"cranelift-codegen",
"libc",
"target-lexicon 0.13.3",
"target-lexicon",
]
[[package]]
@@ -425,7 +425,7 @@ dependencies = [
"object 0.37.3",
"pcode",
"sleigh-runtime",
"target-lexicon 0.13.3",
"target-lexicon",
"tracing",
]
@@ -441,7 +441,7 @@ dependencies = [
"icicle-cpu",
"memoffset",
"pcode",
"target-lexicon 0.13.3",
"target-lexicon",
"tracing",
"wasmtime-jit-debug",
]
@@ -457,7 +457,7 @@ dependencies = [
"object 0.37.3",
"pcode",
"sleigh-runtime",
"target-lexicon 0.13.3",
"target-lexicon",
"tracing",
]
@@ -480,7 +480,7 @@ dependencies = [
"pyo3",
"pyo3-build-config",
"sleigh-runtime",
"target-lexicon 0.13.3",
"target-lexicon",
"tracing",
"tracing-subscriber",
]
@@ -501,7 +501,7 @@ dependencies = [
"serde-xml-rs",
"sleigh-compile",
"sleigh-runtime",
"target-lexicon 0.13.3",
"target-lexicon",
"tracing",
]
@@ -634,9 +634,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.19.0"
version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
name = "overload"
@@ -671,11 +671,10 @@ dependencies = [
[[package]]
name = "pyo3"
version = "0.23.3"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15"
checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
dependencies = [
"cfg-if",
"indexmap",
"indoc",
"libc",
@@ -690,19 +689,18 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
version = "0.23.3"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b"
checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
dependencies = [
"once_cell",
"target-lexicon 0.12.16",
"target-lexicon",
]
[[package]]
name = "pyo3-ffi"
version = "0.23.3"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d"
checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
dependencies = [
"libc",
"pyo3-build-config",
@@ -710,9 +708,9 @@ dependencies = [
[[package]]
name = "pyo3-macros"
version = "0.23.3"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257"
checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
@@ -722,9 +720,9 @@ dependencies = [
[[package]]
name = "pyo3-macros-backend"
version = "0.23.3"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d"
checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
dependencies = [
"heck",
"proc-macro2",
@@ -919,26 +917,12 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "target-lexicon"
version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "target-lexicon"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
[[package]]
name = "tests"
version = "0.0.0"
dependencies = [
"icicle-python",
"pyo3",
]
[[package]]
name = "thiserror"
version = "1.0.40"
Cargo.toml
+5 -13
View File
@@ -1,7 +1,3 @@
[workspace]
members = ["tests"]
exclude = ["icicle-emu"]
[package]
name = "icicle-python"
edition = "2021"
@@ -10,11 +6,12 @@ edition = "2021"
name = "icicle"
crate-type = ["cdylib", "lib"]
[workspace.dependencies]
pyo3 = { version = "0.23.3", features = ["indexmap", "abi3-py37"] }
[[bin]]
name = "tests"
path = "tests.rs"
[dependencies]
pyo3 = { workspace = true }
pyo3 = { version = "0.27.1", features = ["indexmap", "abi3-py38"] }
icicle-cpu = { path = "icicle-emu/icicle-cpu" }
icicle-vm = { path = "icicle-emu/icicle-vm" }
pcode = { path = "icicle-emu/sleigh/pcode" }
@@ -25,9 +22,4 @@ tracing = "*"
tracing-subscriber = "*"
[build-dependencies]
pyo3-build-config = "0.23.3"
# Reference: https://github.com/PyO3/pyo3/issues/340
[features]
extension-module = ["pyo3/extension-module"]
default = ["extension-module"]
pyo3-build-config = "0.27.1"
build.rs
+1 -1
View File
@@ -1,4 +1,4 @@
// Reference: https://pyo3.rs/v0.18.3/building_and_distribution#macos
// Reference: https://pyo3.rs/v0.27.1/building-and-distribution.html?highlight=build.rs#macos
fn main() {
pyo3_build_config::add_extension_module_link_args();
}
pyproject.toml
+2 -8
View File
@@ -13,11 +13,6 @@ classifiers = [
"License :: OSI Approved :: Boost Software License 1.0 (BSL-1.0)",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Development Status :: 5 - Production/Stable",
"Operating System :: POSIX",
"Operating System :: MacOS :: MacOS X",
@@ -31,8 +26,7 @@ Homepage = "https://github.com/icicle-emu/icicle-python"
[tool.maturin]
python-source = "python"
module-name = "icicle.icicle"
features = ["extension-module"]
bindings = "pyo3"
features = ["pyo3/extension-module"]
[dependency-groups]
dev = [
@@ -44,4 +38,4 @@ dev = [
[tool.pytest.ini_options]
testpaths = ["tests"]
python_files = ["*.py"]
python_files = ["*.py"]
src/lib.rs
+1 -1
View File
@@ -213,7 +213,7 @@ impl From<ExceptionCode> for ExceptionCodePy {
#[allow(non_snake_case)]
fn raise_MemoryException(message: String, e: MemError) -> PyErr {
Python::with_gil(|py| {
Python::attach(|py| {
let icicle = py.import("icicle").unwrap();
let exception = icicle.getattr("MemoryException").unwrap();
let args = (message, MemoryExceptionCode::from(e));
tests/tests.rs → tests.rs
View File
tests/Cargo.lock
Generated
-1163
View File
File diff suppressed because it is too large Load Diff
tests/Cargo.toml
-11
View File
@@ -1,11 +0,0 @@
[package]
name = "tests"
edition = "2021"
[[bin]]
name = "tests"
path = "tests.rs"
[dependencies]
icicle-python = { path = "..", default-features = false }
pyo3 = { workspace = true, features = ["auto-initialize"] }
tests/requirements.txt
-2
View File
@@ -1,2 +0,0 @@
keystone-engine==0.9.2
capstone==4.0.2