Macintosh-Tools
/
moa
mirror of https://github.com/transistorfet/moa.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed some ASR cases, and updated test results

This commit is contained in:
transistor 2022-09-18 22:09:56 -07:00
parent 94d3e1d389
commit 48bf76f430
6 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cpus/m68k/execute.rs
View File

@ -295,9 +295,10 @@ impl M68k {
},
Instruction::ASd(count, target, size, shift_dir) => {
let count = self.get_target_value(count, size, Used::Once)? % 64;
let value = self.get_target_value(target, size, Used::Twice)?;
let mut overflow = false;
let mut pair = (self.get_target_value(target, size, Used::Twice)?, false);
let mut pair = (value, false);
let mut previous_msb = get_msb(pair.0, size);
for _ in 0..count {
pair = shift_operation(pair.0, size, shift_dir, true);
@ -308,12 +309,17 @@ impl M68k {
}
self.set_target_value(target, pair.0, size, Used::Twice)?;
let carry = match shift_dir {
ShiftDirection::Left => pair.1,
ShiftDirection::Right => if count < size.in_bits() { pair.1 } else { false }
};
// Adjust flags
self.set_logic_flags(pair.0, size);
self.set_flag(Flags::Overflow, overflow);
if count != 0 {
self.set_flag(Flags::Extend, pair.1);
self.set_flag(Flags::Carry, pair.1);
self.set_flag(Flags::Extend, carry);
self.set_flag(Flags::Carry, carry);
} else {
self.set_flag(Flags::Carry, false);
}

19
tests/harte_tests/latest-excluding-addr-error.txt
View File

@ -1,4 +1,6 @@
ABCD.json completed: 301 passed, 7764 FAILED
Last run on 2022-09-18 at commit 94d3e1d3894e6588ff6daa55f0ba82473b1e74c7
ABCD.json completed: 7993 passed, 72 FAILED
ADD.b.json completed, all passed!
ADD.l.json completed, all passed!
ADD.w.json completed, all passed!
@ -15,9 +17,9 @@ ANDItoSR.json completed, all passed!
ASL.b.json completed: 7238 passed, 827 FAILED
ASL.l.json completed: 6471 passed, 1594 FAILED
ASL.w.json completed: 6248 passed, 830 FAILED
ASR.b.json completed: 6347 passed, 1718 FAILED
ASR.l.json completed: 7040 passed, 1025 FAILED
ASR.w.json completed: 6011 passed, 1137 FAILED
ASR.b.json completed: 7547 passed, 518 FAILED
ASR.l.json completed: 7092 passed, 973 FAILED
ASR.w.json completed: 6761 passed, 387 FAILED
BCHG.json completed, all passed!
BCLR.json completed, all passed!
BSET.json completed, all passed!
@ -71,7 +73,7 @@ MOVEtoSR.json completed, all passed!
MOVEtoUSP.json completed, all passed!
MULS.json completed, all passed!
MULU.json completed, all passed!
NBCD.json completed: 0 passed, 8065 FAILED
NBCD.json completed: 8037 passed, 28 FAILED
NEG.b.json completed, all passed!
NEG.l.json completed, all passed!
NEG.w.json completed, all passed!
@ -104,7 +106,7 @@ ROXR.w.json completed: 7141 passed, 30 FAILED
RTE.json completed, all passed!
RTR.json completed, all passed!
RTS.json completed, all passed!
SBCD.json completed: 884 passed, 7181 FAILED
SBCD.json completed: 6809 passed, 1256 FAILED
SUB.b.json completed, all passed!
SUB.l.json completed, all passed!
SUB.w.json completed, all passed!
@ -123,6 +125,5 @@ TST.l.json completed, all passed!
TST.w.json completed, all passed!
UNLINK.json completed, all passed!
passed: 787242, failed: 42232, total 95%
completed in 15m 58s
passed: 810898, failed: 18576, total 98%
completed in 22m 8s

28
tests/harte_tests/latest.txt
View File

@ -1,6 +1,6 @@
Last run on 2022-09-18 at commit 1a65f50ba0fe4b7ad361f6e5c33fe82b1aee3459
Last run on 2022-09-18 at commit 94d3e1d3894e6588ff6daa55f0ba82473b1e74c7
ABCD.json completed: 301 passed, 7764 FAILED
ABCD.json completed: 7993 passed, 72 FAILED
ADD.b.json completed, all passed!
ADD.l.json completed: 7736 passed, 329 FAILED
ADD.w.json completed: 7712 passed, 353 FAILED
@ -17,15 +17,15 @@ ANDItoSR.json completed, all passed!
ASL.b.json completed: 7238 passed, 827 FAILED
ASL.l.json completed: 6471 passed, 1594 FAILED
ASL.w.json completed: 7053 passed, 1012 FAILED
ASR.b.json completed: 6347 passed, 1718 FAILED
ASR.l.json completed: 7040 passed, 1025 FAILED
ASR.w.json completed: 6763 passed, 1302 FAILED
ASR.b.json completed: 7547 passed, 518 FAILED
ASR.l.json completed: 7092 passed, 973 FAILED
ASR.w.json completed: 7513 passed, 552 FAILED
BCHG.json completed, all passed!
BCLR.json completed, all passed!
BSET.json completed, all passed!
BSR.json completed: 4085 passed, 3980 FAILED
BSR.json completed, all passed!
BTST.json completed: 8052 passed, 13 FAILED
Bcc.json completed: 5865 passed, 2200 FAILED
Bcc.json completed, all passed!
CHK.json completed: 7744 passed, 321 FAILED
CLR.b.json completed, all passed!
CLR.l.json completed: 7472 passed, 593 FAILED
@ -35,7 +35,7 @@ CMP.l.json completed, all passed!
CMP.w.json completed, all passed!
CMPA.l.json completed, all passed!
CMPA.w.json completed, all passed!
DBcc.json completed: 6101 passed, 1964 FAILED
DBcc.json completed, all passed!
DIVS.json completed, all passed!
DIVU.json completed: 8064 passed, 1 FAILED
EOR.b.json completed, all passed!
@ -46,8 +46,8 @@ EORItoSR.json completed, all passed!
EXG.json completed, all passed!
EXT.l.json completed, all passed!
EXT.w.json completed, all passed!
JMP.json completed: 4259 passed, 3806 FAILED
JSR.json completed: 4183 passed, 3882 FAILED
JMP.json completed, all passed!
JSR.json completed, all passed!
LEA.json completed, all passed!
LINK.json completed, all passed!
LSL.b.json completed: 7809 passed, 256 FAILED
@ -73,7 +73,7 @@ MOVEtoSR.json completed, all passed!
MOVEtoUSP.json completed, all passed!
MULS.json completed, all passed!
MULU.json completed, all passed!
NBCD.json completed: 0 passed, 8065 FAILED
NBCD.json completed: 8037 passed, 28 FAILED
NEG.b.json completed, all passed!
NEG.l.json completed: 7552 passed, 513 FAILED
NEG.w.json completed: 7531 passed, 534 FAILED
@ -106,7 +106,7 @@ ROXR.w.json completed: 7880 passed, 185 FAILED
RTE.json completed, all passed!
RTR.json completed, all passed!
RTS.json completed, all passed!
SBCD.json completed: 884 passed, 7181 FAILED
SBCD.json completed: 6809 passed, 1256 FAILED
SUB.b.json completed, all passed!
SUB.l.json completed: 7747 passed, 318 FAILED
SUB.w.json completed: 7716 passed, 349 FAILED
@ -125,5 +125,5 @@ TST.l.json completed, all passed!
TST.w.json completed, all passed!
UNLINK.json completed, all passed!
passed: 918436, failed: 81624, total 92%
completed in 19m 21s
passed: 957924, failed: 42136, total 96%
completed in 24m 47s

10
tests/harte_tests/previous-excluding-addr-error.txt
View File

@ -34,7 +34,7 @@ CMP.w.json completed, all passed!
CMPA.l.json completed, all passed!
CMPA.w.json completed, all passed!
DBcc.json completed, all passed!
DIVS.json completed: 3760 passed, 1232 FAILED
DIVS.json completed, all passed!
DIVU.json completed: 4963 passed, 1 FAILED
EOR.b.json completed, all passed!
EOR.l.json completed, all passed!
@ -101,8 +101,8 @@ ROXL.w.json completed: 7114 passed, 16 FAILED
ROXR.b.json completed: 8037 passed, 28 FAILED
ROXR.l.json completed: 8022 passed, 43 FAILED
ROXR.w.json completed: 7141 passed, 30 FAILED
RTE.json completed: 4011 passed, 4054 FAILED
RTR.json completed: 4038 passed, 4027 FAILED
RTE.json completed, all passed!
RTR.json completed, all passed!
RTS.json completed, all passed!
SBCD.json completed: 884 passed, 7181 FAILED
SUB.b.json completed, all passed!
@ -123,6 +123,6 @@ TST.l.json completed, all passed!
TST.w.json completed, all passed!
UNLINK.json completed, all passed!
passed: 777929, failed: 51545, total 94%
completed in 10m 3s
passed: 787242, failed: 42232, total 95%
completed in 15m 58s

14
tests/harte_tests/previous.txt
View File

@ -1,4 +1,4 @@
Last run on 2022-09-17 at commit 914ddb17dd5179f14e61e95154c2a42a79717ec8
Last run on 2022-09-18 at commit 1a65f50ba0fe4b7ad361f6e5c33fe82b1aee3459
ABCD.json completed: 301 passed, 7764 FAILED
ADD.b.json completed, all passed!
@ -36,7 +36,7 @@ CMP.w.json completed, all passed!
CMPA.l.json completed, all passed!
CMPA.w.json completed, all passed!
DBcc.json completed: 6101 passed, 1964 FAILED
DIVS.json completed: 6833 passed, 1232 FAILED
DIVS.json completed, all passed!
DIVU.json completed: 8064 passed, 1 FAILED
EOR.b.json completed, all passed!
EOR.l.json completed: 7519 passed, 546 FAILED
@ -103,9 +103,9 @@ ROXL.w.json completed: 7892 passed, 173 FAILED
ROXR.b.json completed: 8037 passed, 28 FAILED
ROXR.l.json completed: 8022 passed, 43 FAILED
ROXR.w.json completed: 7880 passed, 185 FAILED
RTE.json completed: 4011 passed, 4054 FAILED
RTR.json completed: 4038 passed, 4027 FAILED
RTS.json completed: 4008 passed, 4057 FAILED
RTE.json completed, all passed!
RTR.json completed, all passed!
RTS.json completed, all passed!
SBCD.json completed: 884 passed, 7181 FAILED
SUB.b.json completed, all passed!
SUB.l.json completed: 7747 passed, 318 FAILED
@ -125,5 +125,5 @@ TST.l.json completed, all passed!
TST.w.json completed, all passed!
UNLINK.json completed, all passed!
passed: 905066, failed: 94994, total 91%
completed in 18m 56s
passed: 918436, failed: 81624, total 92%
completed in 19m 21s

2
tests/harte_tests/run_all.sh
View File

@ -5,7 +5,7 @@ LOCATION=$(dirname ${BASH_SOURCE[0]})
RESULTS=latest.txt
{
cd $LOCATION
echo "Last run on $DATE at commit $COMMIT" | tee $RESULTSt
echo "Last run on $DATE at commit $COMMIT" | tee $RESULTS
echo "" | tee -a $RESULTS
cargo run -- -q --testsuite "../ProcessorTests/680x0/68000/uncompressed/" | tee -a $RESULTS
}