diff --git a/TEST-swen90006.machine.BoundaryTests.txt b/TEST-swen90006.machine.BoundaryTests.txt index c340653a0beba3ed44972bd07a24cfe0a4fb8ce2..37e7451e90e667232502c97df92c127a35aeb12d 100644 --- a/TEST-swen90006.machine.BoundaryTests.txt +++ b/TEST-swen90006.machine.BoundaryTests.txt @@ -1,31 +1,21 @@ Testsuite: swen90006.machine.BoundaryTests -Tests run: 18, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.35 sec +Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.37 sec -Testcase: JmpNeg took 0.004 sec +Testcase: JmpNeg took 0.006 sec Testcase: JzLast took 0.001 sec Testcase: JzPast took 0.001 sec -Testcase: RiHigh took 0.001 sec +Testcase: RiHigh took 0 sec Testcase: StrNeg took 0.001 sec -Testcase: valueLow took 0.001 sec -Testcase: valueHigh took 0.001 sec -Testcase: StrHigh took 0.001 sec -Testcase: Div took 0.002 sec - Caused an ERROR -/ by zero -java.lang.ArithmeticException: / by zero - at swen90006.machine.Machine.do_div(Unknown Source) - at swen90006.machine.Machine.execute(Unknown Source) - at swen90006.machine.BoundaryTests.Div(Unknown Source) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - -Testcase: JzNeg took 0.001 sec -Testcase: RiNeg took 0.001 sec -Testcase: Valid took 0.004 sec +Testcase: valueLow took 0 sec +Testcase: valueHigh took 0 sec +Testcase: StrHigh took 0 sec +Testcase: Div took 0 sec +Testcase: JzNeg took 0 sec +Testcase: RiNeg took 0 sec +Testcase: Valid took 0.006 sec Testcase: JmpLast took 0.001 sec Testcase: JmpPast took 0.001 sec Testcase: JzFirst took 0.001 sec Testcase: NoReturn took 0.002 sec -Testcase: RiValueHigh took 0.002 sec -Testcase: JmpFirst took 0.289 sec +Testcase: RiValueHigh took 0.001 sec +Testcase: JmpFirst took 0.319 sec diff --git a/TEST-swen90006.machine.PartitioningTests.txt b/TEST-swen90006.machine.PartitioningTests.txt index a63c54d32680034b8d3a7c295f1a9c908e612060..e4d3135ea1eb73be6a87c255fb694f9e60490606 100644 --- a/TEST-swen90006.machine.PartitioningTests.txt +++ b/TEST-swen90006.machine.PartitioningTests.txt @@ -1,17 +1,17 @@ Testsuite: swen90006.machine.PartitioningTests -Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.068 sec +Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 sec -Testcase: JmpNeg took 0.009 sec -Testcase: strHigh took 0.006 sec -Testcase: RiHigh took 0.001 sec +Testcase: JmpNeg took 0.006 sec +Testcase: strHigh took 0.005 sec +Testcase: RiHigh took 0.002 sec Testcase: ValueLow took 0.001 sec -Testcase: jzHigh took 0.005 sec -Testcase: strNeg took 0.002 sec +Testcase: jzHigh took 0.006 sec +Testcase: strNeg took 0.001 sec Testcase: Div took 0 sec Testcase: RiNeg took 0.001 sec Testcase: Valid took 0.004 sec -Testcase: jzNeg took 0.003 sec +Testcase: jzNeg took 0.002 sec Testcase: JmpHigh took 0.002 sec -Testcase: NoReturn took 0 sec +Testcase: NoReturn took 0.001 sec Testcase: RiMaxValue took 0.001 sec -Testcase: ValueHigh took 0 sec +Testcase: ValueHigh took 0.001 sec diff --git a/classes/swen90006/machine/Machine.class b/classes/swen90006/machine/Machine.class index 7016ffa225790cdf3bdffe9762ca3de4168e1569..0ab5b48bb6e548887f83b0df028a29bc8694c4c8 100644 Binary files a/classes/swen90006/machine/Machine.class and b/classes/swen90006/machine/Machine.class differ diff --git a/src/swen90006/machine/Machine.java b/src/swen90006/machine/Machine.java index 61c7bf885ef13a818f241b2627a49c206f74ee51..c4379231559b9a4ebbbf96456b3de0aca6bba696 100644 --- a/src/swen90006/machine/Machine.java +++ b/src/swen90006/machine/Machine.java @@ -73,7 +73,7 @@ public class Machine private void do_div(int dest, int src1, int src2) { - if (regs[src2] == 100){ + if (regs[src2] == 0){ /* no op */ }else{ regs[dest] = regs[src1] / regs[src2];