Skip to content

Commit 15c61f1

Browse files
authored
Merge branch 'main' into copy
2 parents cfc5d94 + 8f5519c commit 15c61f1

13 files changed

+694
-766
lines changed

Cargo.lock

Lines changed: 4 additions & 4 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: 2 additions & 2 deletions
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
@@ -179,7 +179,7 @@ encoding_rs = { version = "0.8.35", optional = true }
179179
# demangler
180180
cpp_demangle = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
181181
cwdemangle = { version = "1.0", optional = true }
182-
gnuv2_demangle = { version = "0.1.0", optional = true }
182+
gnuv2_demangle = { version = "0.3", optional = true }
183183
msvc-demangler = { version = "0.11", optional = true }
184184

185185
[target.'cfg(windows)'.dependencies]

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)