add support for specifying ranges for incbin, incbinstr, and `inc…

…hexstr`

src/asm/resolver/eval_fn.rs

@@ -123,7 +123,7 @@ fn eval_builtin_incbin(
     query: &mut expr::EvalFunctionQuery)
     -> Result<expr::Value, ()>
 {
-    query.ensure_arg_number(1)?;
+    query.ensure_min_max_arg_number(1, 3)?;
 
     let relative_filename = query.args[0].value.expect_string(
         query.report,
@@ -148,8 +148,59 @@ fn eval_builtin_incbin(
         Some(query.args[0].span),
         file_handle)?;
 
+    let start = {
+        if query.args.len() >= 2
+        {
+            query.args[1].value.expect_usize(
+                query.report,
+                query.args[1].span)?
+        }
+        else
+        {
+            0
+        }
+    };
+
+    let end = {
+        if query.args.len() >= 3
+        {
+            let size = query.args[2].value.expect_usize(
+                query.report,
+                query.args[2].span)?;
+
+            start + size
+        }
+        else
+        {
+            bytes.len()
+        }
+    };
+
+    if start >= bytes.len()
+    {
+        query.report.error_span(
+            format!(
+                "`incbin` range starts after EOF ({} >= {})",
+                start,
+                bytes.len()),
+            query.args[1].span);
+        return Err(());
+    }
+
+    if end > bytes.len()
+    {
+        query.report.error_span(
+            format!(
+                "`incbin` range ends after EOF ({} + {} > {})",
+                start,
+                end - start,
+                bytes.len()),
+            query.args[2].span);
+        return Err(());
+    }
+
     Ok(expr::Value::make_integer(
-        util::BigInt::from_bytes_be(&bytes)))
+        util::BigInt::from_bytes_be(&bytes[start..end])))
 }
 
 
@@ -167,7 +218,8 @@ fn eval_builtin_incbinstr(
         decls,
         defs,
         ctx,
-        query)
+        query,
+        "incbinstr")
 }
 
 
@@ -185,7 +237,8 @@ fn eval_builtin_inchexstr(
         decls,
         defs,
         ctx,
-        query)
+        query,
+        "inchexstr")
 }
 
 
@@ -195,10 +248,11 @@ fn eval_builtin_incstr(
     _decls: &asm::ItemDecls,
     _defs: &asm::ItemDefs,
     ctx: &asm::ResolverContext,
-    query: &mut expr::EvalFunctionQuery)
+    query: &mut expr::EvalFunctionQuery,
+    funcname: &str)
     -> Result<expr::Value, ()>
 {
-    query.ensure_arg_number(1)?;
+    query.ensure_min_max_arg_number(1, 3)?;
 
     let relative_filename = query.args[0].value.expect_string(
         query.report,
@@ -258,5 +312,65 @@ fn eval_builtin_incstr(
         }
     }
 
-    Ok(expr::Value::make_integer(bitvec.to_bigint()))
-}
+    let bigint = bitvec.to_bigint();
+
+    let bigint_size = bigint.size.unwrap();
+
+    let start = {
+        if query.args.len() >= 2
+        {
+            query.args[1].value.expect_usize(
+                query.report,
+                query.args[1].span)?
+        }
+        else
+        {
+            0
+        }
+    };
+
+    let end = {
+        if query.args.len() >= 3
+        {
+            let size = query.args[2].value.expect_usize(
+                query.report,
+                query.args[2].span)?;
+
+            start + size
+        }
+        else
+        {
+            bigint_size / bits_per_char
+        }
+    };
+
+    if (start * bits_per_char) >= bigint_size
+    {
+        query.report.error_span(
+            format!(
+                "`{}` range starts after EOF ({} >= {})",
+                funcname,
+                start,
+                bigint_size / bits_per_char),
+            query.args[1].span);
+        return Err(());
+    }
+
+    if (end * bits_per_char) > bigint_size
+    {
+        query.report.error_span(
+            format!(
+                "`{}` range ends after EOF ({} + {} > {})",
+                funcname,
+                start,
+                end - start,
+                bigint_size / bits_per_char),
+            query.args[2].span);
+        return Err(());
+    }
+
+    Ok(expr::Value::make_integer(
+        bigint.slice(
+            bigint_size - (start * bits_per_char),
+            bigint_size - (end * bits_per_char))))
+}

src/expr/expression.rs

@@ -361,7 +361,7 @@ impl Value
 			_ =>
 			{
 				report.error_span(
-					"expected integer",
+					"expected non-negative integer",
 					span);
 
 				Err(())
@@ -394,7 +394,7 @@ impl Value
 			_ =>
 			{
 				report.error_span(
-					"expected integer",
+					"expected non-negative integer",
 					span);
 
 				Err(())
@@ -430,7 +430,7 @@ impl Value
 			_ =>
 			{
 				report.error_span(
-					"expected integer",
+					"expected positive integer",
 					span);
 
 				Err(())

src/test/expr.rs

@@ -275,8 +275,8 @@ fn test_ops_slice()
 	test("-1[1000:1000]", Pass(expr::Value::make_integer(util::BigInt::new(1, Some(1)))));
 
 	test("0x00[0:7]", Fail(("test", 1, "invalid")));
-	test("0x00`{}", Fail(("test", 1, "expected integer")));
-	test("0x00`(1 == 2)", Fail(("test", 1, "expected integer")));
+	test("0x00`{}", Fail(("test", 1, "expected non-negative integer")));
+	test("0x00`(1 == 2)", Fail(("test", 1, "expected non-negative integer")));
 	test("0x00`-1", Fail(("test", 1, "expected expression")));
 	test("0x00`(-1)", Fail(("test", 1, "out of supported range")));
 	test("0x00[7:-1]", Fail(("test", 1, "out of supported range")));

src/util/bigint.rs

@@ -341,9 +341,19 @@ impl BigInt
             panic!("invalid slice range");
         }
 
+        if let Some(size) = self.size
+        {
+            if self.bigint.sign() != num_bigint::Sign::Minus &&
+                left == size &&
+                right == 0
+            {
+                return self.clone();
+            }
+        }
+
         let mut result = BigInt::from(0);
 
-        for i in 0..(left - right)
+        for i in (0..(left - right)).rev()
         {
             result.set_bit(
                 i,

tests/incbin/err_end_after_eof.asm

@@ -0,0 +1 @@
+#d incbin("data1.bin",2,4) ; error: failed / error: ends after EOF (2 + 4 > 5)

tests/incbin/err_start_after_eof.asm

@@ -0,0 +1 @@
+#d incbin("data1.bin",5) ; error: failed / error: starts after EOF (5 >= 5)

tests/incbin/err_too_few_arguments.asm

@@ -1 +1 @@
-#d incbin() ; error: failed / error: expected 1 argument
+#d incbin() ; error: failed / error: expected 1 to 3 arguments

tests/incbin/err_too_many_args.asm

@@ -1 +1 @@
-#d incbin("data1.bin", "data2.bin") ; error: failed / error: expected 1 argument
+#d incbin("data1.bin", 1, 2, 3) ; error: failed / error: expected 1 to 3 arguments

tests/incbin/err_wrong_usage.asm

@@ -0,0 +1 @@
+#d incbin("data1.bin", "data2.bin") ; error: failed / error: expected non-negative integer

tests/incbin/ok_start.asm

@@ -0,0 +1 @@
+#d incbin("data1.bin",1) ; = 0x656c6c6f

tests/incbin/ok_start_size.asm

@@ -0,0 +1 @@
+#d incbin("data1.bin",2,2) ; = 0x6c6c

tests/incbinstr/err_end_after_eof.asm

@@ -0,0 +1 @@
+#d incbinstr("data1.txt",4,8) ; error: failed / error: ends after EOF (4 + 8 > 8)

tests/incbinstr/err_start_after_eof.asm

@@ -0,0 +1 @@
+#d incbinstr("data1.txt",8) ; error: failed / error: starts after EOF (8 >= 8)

tests/incbinstr/err_too_few_args.asm

@@ -1 +1 @@
-#d incbinstr() ; error: failed / error: expected 1 argument
+#d incbinstr() ; error: failed / error: expected 1 to 3 arguments

tests/incbinstr/err_too_many_args.asm

@@ -1 +1 @@
-#d incbinstr("data1.txt", "data2.txt") ; error: failed / error: expected 1 argument
+#d incbinstr("data1.txt",0,1,2) ; error: failed / error: expected 1 to 3 arguments

tests/incbinstr/err_wrong_usage.asm

@@ -0,0 +1 @@
+#d incbinstr("data1.txt", "data2.txt") ; error: failed / error: expected non-negative integer

tests/incbinstr/ok_start.asm

@@ -0,0 +1 @@
+#d incbinstr("data3.txt",4) ; =0xaf5a

tests/incbinstr/ok_start_size.asm

@@ -0,0 +1 @@
+#d incbinstr("data3.txt",8,8) ; =0xf5

tests/inchexstr/err_end_after_eof.asm

@@ -0,0 +1 @@
+#d inchexstr("data1.txt",2,4) ; error: failed / error: ends after EOF (2 + 4 > 4)

tests/inchexstr/err_start_after_eof.asm

@@ -0,0 +1 @@
+#d inchexstr("data1.txt",4) ; error: failed / error: starts after EOF (4 >= 4)

tests/inchexstr/err_too_few_args.asm

@@ -1 +1 @@
-#d inchexstr() ; error: failed / error: expected 1 argument
+#d inchexstr() ; error: failed / error: expected 1 to 3 arguments

tests/inchexstr/err_too_many_args.asm

@@ -1 +1 @@
-#d inchexstr("data1.txt", "data2.txt") ; error: failed / error: expected 1 argument
+#d inchexstr("data1.txt",0,1,2) ; error: failed / error: expected 1 to 3 arguments

tests/inchexstr/err_wrong_usage.asm

@@ -0,0 +1 @@
+#d inchexstr("data1.txt", "data2.txt") ; error: failed / error: expected non-negative integer

tests/inchexstr/ok_start.asm

@@ -0,0 +1 @@
+#d inchexstr("data3.txt",4) ; =0x5a5af5a5a0000

tests/inchexstr/ok_start_size.asm

@@ -0,0 +1 @@
+#d inchexstr("data3.txt",8,2) ; =0xf5