AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Quick valider fix

Browse source
This commit is contained in:
Erin 2023-07-25 23:03:06 +02:00
parent ac149a5319
commit 92793dc93b
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
hbvm/src/validate.rs
View file

@ -47,7 +47,6 @@ pub fn validate(mut program: &[u8]) -> Result<(), Error> {
let start = program; let start = program;
loop { loop {
use hbbytecode::opcode::*; use hbbytecode::opcode::*;
// Match on instruction types and perform necessary checks // Match on instruction types and perform necessary checks
program = match program { program = match program {
// End of program // End of program
@ -76,14 +75,16 @@ pub fn validate(mut program: &[u8]) -> Result<(), Error> {
} }
// Valid instructions // Valid instructions
[UN | NOP | ECALL, rest @ ..] [DIR | DIRF | FMAF, _, _, _, _, rest @ ..] // BBBB
| [DIR | DIRF, _, _, _, _, rest @ ..] | [ADD | SUB | MUL | AND | OR | XOR | SL | SR | SRS | CMP | CMPU | BRC | ADDF | SUBF | MULF, _, _, _, rest @ ..]
| [ADD..=CMPU | BRC | ADDF..=MULF, _, _, _, rest @ ..] | [LD | ST, _, _, _, _, _, _, _, _, _, _, _, rest @ ..] // BBDH
| [NEG..=NOT | CP..=SWA | NEGF..=FTI, _, _, rest @ ..] | [
| [LI, _, _, _, _, _, _, _, _, _, rest @ ..] ADDI | MULI | ANDI | ORI | XORI | CMPI | CMPUI | BMC | JAL | JEQ | JNE | JLT | JGT | JLTU | JGTU | ADDFI | MULFI, _, _, _, _, _, _, _, _, _, _, rest @ ..] // BBD
| [ADDI..=XORI | CMPI..=CMPUI | BMC | JAL..=JGTU | ADDFI..=MULFI, _, _, _, _, _, _, _, _, _, _, rest @ ..] | [SLI | SRI | SRSI, _, _, _, _, _, _, rest @ ..] // BBW
| [SLI..=SRSI, _, _, _, _, rest @ ..] | [NEG | NOT | CP | SWA | NEGF | ITF | FTI, _, _, rest @ ..] // BB
| [LD..=ST, _, _, _, _, _, _, _, _, _, _, _, _, rest @ ..] => rest, | [LI, _, _, _, _, _, _, _, _, _, rest @ ..] // BD
| [UN | NOP | ECALL, rest @ ..] // N
=> rest,
// The rest // The rest
_ => { _ => {