Ignore int3 instructions when counting instructions in tests

Amanieu · Amanieu · commit 443063a317a0 · 2024-06-07T19:18:13.000+02:00
These are generated as padding and are not actually part of the
function.
diff --git a/crates/stdarch-test/src/lib.rs b/crates/stdarch-test/src/lib.rs
@@ -71,7 +71,7 @@ pub fn assert(shim_addr: usize, fnname: &str, expected: &str) {
     //eprintln!("  function: {:?}", function);
 
     let mut instrs = &function.instrs[..];
-    while instrs.last().map_or(false, |s| s == "nop") {
+    while instrs.last().map_or(false, |s| s == "nop" || s == "int3") {
         instrs = &instrs[..instrs.len() - 1];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ pub fn assert(shim_addr: usize, fnname: &str, expected: &str) {`
`71`	`71`	`//eprintln!(" function: {:?}", function);`
`72`	`72`
`73`	`73`	`let mut instrs = &function.instrs[..];`
`74`		`- while instrs.last().map_or(false, \|s\| s == "nop") {`
	`74`	`+ while instrs.last().map_or(false, \|s\| s == "nop" \|\| s == "int3") {`
`75`	`75`	`instrs = &instrs[..instrs.len() - 1];`
`76`	`76`	`}`
`77`	`77`