Skip to content

Commit 19ec08b

Browse files
authored
Update unarm to 2.0 (#274)
* Migrate to unarm 2.0 * Update unarm to proper 2.0 release * Deduplicate formatters for opaque instruction parts in ARM * Add option to enable VFPv2 for ARM * Update unarm to 2.0.1 * Fix read order for big-endian Thumb code * Skip leading space in ARM instruction params * Update ARM tests * arm.rs: Use `alloc::borrow::Cow`
1 parent 2ad0898 commit 19ec08b

12 files changed

+690
-762
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objdiff-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ rabbitizer = { version = "2.0.0-alpha.4", default-features = false, features = [
161161
iced-x86 = { version = "1.21", default-features = false, features = ["decoder", "intel", "gas", "masm", "nasm", "exhaustive_enums", "no_std"], optional = true }
162162

163163
# arm
164-
unarm = { version = "1.9", optional = true }
164+
unarm = { version = "2.0", optional = true }
165165
arm-attr = { version = "0.2", optional = true }
166166

167167
# arm64

objdiff-core/config-schema.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,43 @@
128128
"value": "auto",
129129
"name": "Auto"
130130
},
131+
{
132+
"value": "v4",
133+
"name": "ARMv4"
134+
},
131135
{
132136
"value": "v4t",
133137
"name": "ARMv4T (GBA)"
134138
},
139+
{
140+
"value": "v5t",
141+
"name": "ARMv5T"
142+
},
135143
{
136144
"value": "v5te",
137145
"name": "ARMv5TE (DS)"
138146
},
147+
{
148+
"value": "v5tej",
149+
"name": "ARMv5TEJ"
150+
},
151+
{
152+
"value": "v6",
153+
"name": "ARMv6"
154+
},
139155
{
140156
"value": "v6k",
141157
"name": "ARMv6K (3DS)"
142158
}
143159
]
144160
},
161+
{
162+
"id": "arm.vfpV2",
163+
"type": "boolean",
164+
"default": true,
165+
"name": "VFPv2 instructions",
166+
"description": "Adds floating-point instructions from VFPv2."
167+
},
145168
{
146169
"id": "arm.unifiedSyntax",
147170
"type": "boolean",
@@ -328,6 +351,7 @@
328351
"name": "ARM",
329352
"properties": [
330353
"arm.archVersion",
354+
"arm.vfpV2",
331355
"arm.unifiedSyntax",
332356
"arm.avRegisters",
333357
"arm.r9Usage",

0 commit comments

Comments
 (0)