Merge pull request #5 from clairechingching/master

feat: catch error from instruction byte parse

Cargo.lock

@@ -827,6 +827,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "sbpf-common"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39a8ff075e738e3850c291334f6f7e45379ad442366f3f4b1f9f9bf0674fa61d"
+dependencies = [
+ "num-derive",
+ "num-traits",
+]
+
 [[package]]
 name = "sbpf-linker"
 version = "0.1.3"
@@ -839,6 +849,7 @@ dependencies = [
  "llvm-sys 211.0.0",
  "object",
  "sbpf-assembler",
+ "sbpf-common",
  "thiserror 2.0.17",
  "tracing",
  "tracing-appender",

Cargo.toml

@@ -16,7 +16,9 @@ crate-type = ["cdylib", "lib"]
 name = "sbpf_linker"
 
 [dependencies]
+# TODO: update versions for sbpf-assembler and sbpf-common
 sbpf-assembler = "0.1.2"
+sbpf-common = "0.1.2"
 clap = { version = "4.5.13", features = ["derive"] }
 object = "0.37.3"
 bpf-linker = "0.9.15"

src/byteparser.rs

@@ -2,8 +2,8 @@ use sbpf_assembler::ast::AST;
 use sbpf_assembler::astnode::{ASTNode, ROData};
 use sbpf_assembler::instruction::Instruction;
 use sbpf_assembler::lexer::{ImmediateValue, Token};
-use sbpf_assembler::opcode::Opcode;
 use sbpf_assembler::parser::ParseResult;
+use sbpf_common::opcode::Opcode;
 
 use object::RelocationTarget::Symbol;
 use object::{File, Object as _, ObjectSection as _, ObjectSymbol as _};
@@ -64,10 +64,15 @@ pub fn parse_bytecode(bytes: &[u8]) -> Result<ParseResult, SbpfLinkerError> {
                         _ => 8,
                     };
                 let node = &section.data().unwrap()[offset..offset + node_len];
-                ast.nodes.push(ASTNode::Instruction {
-                    instruction: Instruction::from_bytes(node).unwrap(),
-                    offset: offset as u64,
-                });
+                let instruction = Instruction::from_bytes(node);
+                if let Err(error) = instruction {
+                    return Err(error.to_string());
+                } else {
+                    ast.nodes.push(ASTNode::Instruction {
+                        instruction: instruction.unwrap(),
+                        offset: offset as u64,
+                    });
+                }
                 offset += node_len;
             }
 
@@ -79,10 +84,8 @@ pub fn parse_bytecode(bytes: &[u8]) -> Result<ParseResult, SbpfLinkerError> {
                         Symbol(sym) => Some(obj.symbol_by_index(sym).unwrap()),
                         _ => None,
                     };
-
-                    if symbol.unwrap().section_index()
-                        == Some(ro_section.index())
-                    {
+                
+                    if symbol.unwrap().section_index() == Some(ro_section.index()) {
                         // addend is not explicit in the relocation entry, but implicitly encoded
                         // as the immediate value of the instruction
                         let addend = match ast