Skip to content

Commit 2481185

Browse files
committed
Merge branch 'release-2.7.0' into release
2 parents 21082f8 + 4fe305c commit 2481185

File tree

16 files changed

+135
-39
lines changed

16 files changed

+135
-39
lines changed

BuiltInChips/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>BuiltInChips</artifactId>

BuiltInVMCode/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>BuiltInVMCode</artifactId>

CPUEmulator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>CPUEmulator</artifactId>

CompilersPackage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>CompilersPackage</artifactId>

HackGUIPackage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>HackGUIPackage</artifactId>

HackPackage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>HackPackage</artifactId>

HardwareSimulator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>HardwareSimulator</artifactId>

SimulatorsGUIPackage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>SimulatorsGUIPackage</artifactId>

SimulatorsPackage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.nand2tetris</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.6.2</version>
8+
<version>2.7.0</version>
99
</parent>
1010

1111
<artifactId>SimulatorsPackage</artifactId>

SimulatorsPackage/src/main/java/Hack/CPUEmulator/CPU.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class CPU
5151
// The time that passed since the program started running.
5252
protected long time;
5353

54-
// An assembler transltor
54+
// An assembler translator
5555
protected HackAssemblerTranslator assemblerTranslator;
5656

5757
/**
@@ -161,8 +161,8 @@ public void executeInstruction() throws ProgramException {
161161
bus.send(rom, PC.get(), A, 0);
162162
else if ((instruction & 0xe000) == 0xe000) {
163163
computeExp(instruction);
164-
setDestination(instruction);
165164
pcChanged = checkJump(instruction);
165+
setDestination(instruction);
166166
}
167167
else if (instruction != HackAssemblerTranslator.NOP)
168168
throw new ProgramException("At line " + PC.get() +

0 commit comments

Comments
 (0)