diff options
| author | Christopher Pulte | 2019-03-04 14:03:17 +0000 |
|---|---|---|
| committer | Christopher Pulte | 2019-03-04 14:03:17 +0000 |
| commit | 4be604551897b00a09c4cc5535331181caf54621 (patch) | |
| tree | ee0804adf0b1317b40cc758696f7e10577cbf871 /aarch64_small | |
| parent | fe38a36269d6feabfd64d23e24b2adcc4d0dab10 (diff) | |
more sail1-to-sail2 porting
Diffstat (limited to 'aarch64_small')
| -rw-r--r-- | aarch64_small/aarch64_regfp.sail | 3 | ||||
| -rw-r--r-- | aarch64_small/armV8.sail | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/aarch64_small/aarch64_regfp.sail b/aarch64_small/aarch64_regfp.sail index 4d2051ba..55f4a16b 100644 --- a/aarch64_small/aarch64_regfp.sail +++ b/aarch64_small/aarch64_regfp.sail @@ -599,7 +599,8 @@ function initial_analysis (instr:ast) -> (regfps,regfps,regfps,niafps,diafp,inst iR = appendL(xFP(n),appendL(xFP(m),iR)); if setflags then oR = appendL(NZCVfp,oR); oR = appendL(xFP(d),oR); - } + }, + Unallocated() => exit() }; (iR,oR,aR,Nias,Dia,ik) } diff --git a/aarch64_small/armV8.sail b/aarch64_small/armV8.sail index c7d2d480..b2f493ad 100644 --- a/aarch64_small/armV8.sail +++ b/aarch64_small/armV8.sail @@ -565,6 +565,9 @@ function decodeTestBranchImmediate ([b5]@0b011011@[op]@(b40 : bits(5))@(imm14 : } function clause execute ( TestBitAndBranch((t:reg_index,datasize as atom('R),bit_pos,bit_val,offset)) ) = { + + /* assert ('R == 32 | 'R == 64); */ + let operand : bits('R) = rX(t); if operand[bit_pos] == bit_val then |