Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use LLVM objdump on Macos instead of otool for CI tests #1208

Merged
merged 6 commits into from
Sep 8, 2021
Merged

Use LLVM objdump on Macos instead of otool for CI tests #1208

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f1d230
Use LLVM objdump on Macos ARM64 because it is not possible to enable …
hkratz Sep 7, 2021
c256c81
Use objdump on Macos x86_64 as well.
hkratz Sep 8, 2021
0cc4f0b
using v8.6a target feature to cover more instructions
hkratz Sep 8, 2021
87b8c76
Run CI on Macos (Big Sur) again. Since otool is no longer used the OO…
hkratz Sep 8, 2021
4ff03ba
remove assembly parsing special case for otool output (no longer needed)
hkratz Sep 8, 2021
eca3bdd
Implement proper subroutine call detection for x86, x86_64, aarch64 a…
hkratz Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions crates/stdarch-test/src/disassembly.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,24 @@ pub(crate) fn disassemble_myself() -> HashSet<Function> {
String::from_utf8_lossy(Vec::leak(output.stdout))
} else if cfg!(target_os = "windows") {
panic!("disassembly unimplemented")
} else if cfg!(target_os = "macos") && cfg!(target_arch = "aarch64") {
// use LLVM objdump because it is not possible to enable TME support with otool
let objdump = env::var("OBJDUMP").unwrap_or_else(|_| "objdump".to_string());
let output = Command::new(objdump.clone())
.arg("--disassemble")
.arg("--no-show-raw-insn")
.arg("--mattr=+crc,+crypto,+tme")
.arg(&me)
.output()
.unwrap_or_else(|_| panic!("failed to execute objdump. OBJDUMP={}", objdump));
println!(
"{}\n{}",
output.status,
String::from_utf8_lossy(&output.stderr)
);
assert!(output.status.success());

String::from_utf8_lossy(Vec::leak(output.stdout))
} else if cfg!(target_os = "macos") {
let output = Command::new("otool")
.arg("-vt")
Expand Down