Misc improvements

Author: xarantolus

examples/programs/fib_c_nostdlib/fib_c_nostdlib.c

@@ -26,17 +26,18 @@ int sys_write(unsigned fd, const char *buf, unsigned count)
 	return ret;
 }
 
-void to_hex(char *buf, uint64_t num)
+int to_hex(char *buf, uint64_t num)
 {
 	int i = 0;
 
 	if (num == 0)
 	{
 		buf[i] = '0';
+		i++;
 	}
 	else
 	{
-		char stack[16] = {0};
+		char stack[32] = {0};
 		int stack_i = 0;
 
 		while (num > 0)
@@ -63,11 +64,13 @@ void to_hex(char *buf, uint64_t num)
 			i++;
 		}
 	}
-	buf[i++] = '\n';
+	buf[i] = '\n';
+	i++;
 	buf[i] = '\0';
+
+	return i;
 }
 
-// Print first 75 Fibonacci numbers
 void _start()
 {
 	uint64_t a = 0;
@@ -77,15 +80,20 @@ void _start()
 
 	char buf[128];
 
-	while (counter < 75)
+	while (counter < 25)
 	{
-		int64_t c = a + b;
+		int64_t c;
+		if (__builtin_add_overflow(a, b, &c))
+		{
+			sys_write(2, "Overflow\n", 9);
+			sys_exit(1);
+		}
 		a = b;
 		b = c;
 		counter++;
 
-		to_hex(buf, a);
-		sys_write(1, buf, 128);
+		int len = to_hex(buf, a);
+		sys_write(1, buf, len);
 	}
 
 	sys_exit(0);

src/elf/elf.rs

@@ -354,6 +354,8 @@ mod tests {
 
     // test_binary![exit_c; "../../testdata/exit_c.bin"; ""; 5];
 
+    // test_binary![fib_c_nostdlib; "../../testdata/fib_c_nostdlib.bin"; "1\n1\n2\n3\n5\n8\nd\n15\n22\n37\n59\n90\ne9\n179\n262\n3db\n63d\na18\n1055\n1a6d\n2ac2\n452f\n6ff1\nb520\n12511"; 0];
+
     test_async![binary_without_symbols; async {
         let bin = Axecutor::from_binary(include_bytes!("../../testdata/exit_c_no_symbols.bin")).expect("Failed to parse binary");
         // Should only include the _start symbol

src/helpers/stack.rs

@@ -0,0 +1 @@
+// TODO: Implement printing the current stack

src/helpers/trace.rs

@@ -20,6 +20,7 @@ pub(crate) enum TraceVariant {
     Call,
     Return,
     Jump,
+    // TODO: Add syscall
 }
 
 // This is for the full tracing functionality, not to be confused with call_stack
@@ -94,7 +95,7 @@ impl Axecutor {
                 }
             };
             let instruction_symbol = if entry.instr_ip == 0 {
-                "<emulator_start>".to_string()
+                "<emulation_start>".to_string()
             } else {
                 match self.symbol_table.get(&entry.instr_ip) {
                     Some(sym) => format!("{}@{:#x}", sym, entry.instr_ip),
@@ -155,7 +156,7 @@ mod tests {
 
         debug_log!("Trace:\n{}", trace);
 
-        assert_eq!(trace, r#"<emulator_start>: entrypoint => _start@0x401000
+        assert_eq!(trace, r#"<emulation_start>: entrypoint => _start@0x401000
   _start@0x401000: call 0000000000401015h => first_level@0x401015
     first_level@0x401015: jmp short 000000000040101Eh => 0x40101e
     0x40101e: call 0000000000401031h => second_level@0x401031
@@ -210,7 +211,7 @@ mod tests {
 
         debug_log!("Trace:\n{}", trace);
 
-        assert_eq!(trace, format!(r#"<emulator_start>: entrypoint => _start@0x40101a
+        assert_eq!(trace, format!(r#"<emulation_start>: entrypoint => _start@0x40101a
   0x401034: jmp short 000000000040103Eh => 0x40103e
   0x401042: jle short 0000000000401036h => 0x401036 ({} times)
   0x401049: call 0000000000401000h => sys_exit@0x401000

src/state/memory.rs

@@ -121,7 +121,7 @@ impl MemoryArea {
             s.push_str(&format!(
                 "{}    string: {:?},\n",
                 " ".repeat(i * 4),
-                String::from_utf8_lossy(&self.data)
+                String::from_utf8_lossy(&self.data[..self.data.len() - 1])
             ));
         }
 

t.py

@@ -992,7 +992,7 @@ def is_new(flags_set, flags_not_set, input_flags):
             def imap_func(input: tuple[int, Input]):
                 return TestCase.learn_single_flags(input[0], assembled, instruction, input[1], tmpdir)
 
-            with Pool(os.cpu_count() * 4) as p:
+            with Pool(os.cpu_count() * 8) as p:
                 temp_results = list(
                     tqdm(
                         p.imap(imap_func, enumerate(input_args)),