Skip to content

Commit 9b24a8e

Browse files
committed
patch file system bugs, change bsim checksum calc, increase size of console region, update checkoff files
1 parent c6e7d5c commit 9b24a8e

9 files changed

Lines changed: 381 additions & 370 deletions

File tree

bsim/assemble.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@
742742
PCheckoff.prototype.assemble = function(context, out) {
743743
Checkoff.prototype.assemble.call(this, context, out);
744744
if(out) {
745-
context.checkoff.running_checksum = 36038;
745+
context.checkoff.running_checksum = 36036;
746746
context.checkoff.addresses = {};
747747
}
748748
};

bsim/bsim.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pre.tty-output {
5353
}
5454

5555
.tty {
56-
width: 454px;
56+
width: 600px;
5757
}
5858

5959
div.stack-holder {
@@ -85,14 +85,15 @@ div.memory-holder {
8585
#checkoff-failure {
8686
position: absolute;
8787
bottom: 0;
88-
left: 500px;
88+
left: 620px;
8989
height: 120px;
9090
width: 340px;
9191
}
9292

9393
.memory-key ul {
9494
list-style: none;
9595
margin-left: 0px;
96+
margin-bottom: 0px;
9697
}
9798

9899
.memory-key span {

bsim/tests/assemble.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ test(".pcheckoff works", function() {
636636
deepEqual(result.checkoff, {
637637
kind: 'memory',
638638
addresses: {},
639-
running_checksum: 36038,
639+
running_checksum: 36036,
640640
url: 'some url',
641641
name: 'some name',
642642
checksum: 42
@@ -661,30 +661,30 @@ test(".pcheckoff works", function() {
661661

662662
assembler.assemble("t.uasm", '.pcheckoff "some url" "some name" 42\n.verify 0 1 2', function(success, result) {
663663
deepEqual(result.checkoff.addresses, {0: 2}, "Single address is correct.");
664-
equal(result.checkoff.running_checksum, 36040, "Single address checksum is correct");
664+
equal(result.checkoff.running_checksum, 36038, "Single address checksum is correct");
665665
});
666666

667667
assembler.assemble("t.uasm", '.pcheckoff "some url" "some name" 42\n.verify 0 2 6 5', function(success, result) {
668668
deepEqual(result.checkoff.addresses, {0: 6, 4: 5}, "Multiple address is correct.");
669-
equal(result.checkoff.running_checksum, 36062, "Multiple address checksum is correct");
669+
equal(result.checkoff.running_checksum, 36060, "Multiple address checksum is correct");
670670
});
671671

672672
assembler.assemble("t.uasm", '.pcheckoff "some url" "some name" 42\n.verify 8 1 6', function(success, result) {
673673
deepEqual(result.checkoff.addresses, {8: 6}, "Single offset address is correct.");
674-
equal(result.checkoff.running_checksum, 36052, "Single offset address checksum is correct");
674+
equal(result.checkoff.running_checksum, 36050, "Single offset address checksum is correct");
675675
});
676676

677677
assembler.assemble("t.uasm", '.pcheckoff "some url" "some name" 42\n.verify 8 2 6 9', function(success, result) {
678678
deepEqual(result.checkoff.addresses, {8: 6, 12: 9}, "Multiple offset address is correct.");
679-
equal(result.checkoff.running_checksum, 36094, "Multiple offset address checksum is correct");
679+
equal(result.checkoff.running_checksum, 36092, "Multiple offset address checksum is correct");
680680
});
681681

682682
assembler.assemble("t.uasm", '.pcheckoff "some url" "some name" 42\n.verify 4 2 3 7\n.verify 32 3 20 21 22', function(success, result) {
683683
deepEqual(result.checkoff.addresses, {4: 3, 8: 7, 32: 20, 36: 21, 40: 22}, "Multiple statementt address is correct.");
684-
equal(result.checkoff.running_checksum, 36427, "Multiple statement checksum is correct");
684+
equal(result.checkoff.running_checksum, 36425, "Multiple statement checksum is correct");
685685
});
686686

687687
assembler.assemble("t.uasm", '.pcheckoff "some url" "some name" 42\n.verify 0x20 8 0x73657420 0x2e2e2e74 0xa 0x20000000 0x73ff0143 0xc15f04e0 0x42ff04e1 0xd2370056', function(success, result) {
688-
equal(result.checkoff.running_checksum, -2102874766, "Negative checksum is calculated correctly.");
688+
equal(result.checkoff.running_checksum, -2102874770, "Negative checksum is calculated correctly.");
689689
});
690690
});

bsim/verify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BSim.TextVerifier = function(beta, checkoff) {
1010
for(var ret = 0, i = 0, len = str.length; i < len; i++) {
1111
ret = (31 * ret + str.charCodeAt(i)) << 0;
1212
}
13-
return ret + 36038; // Where does 36038 come from? I have no idea.
13+
return ret + 36036; // Where does 36036 come from? I have no idea.
1414
};
1515

1616
this.verify = function() {

deploy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
#!/bin/sh
2-
rsync -avz -e ssh built/* 6004.mit.edu:webdocs/coursewarex/
2+
grunt
3+
rsync -avz -e ssh built/* 6004.mit.edu:ssldocs/coursewarex/

0 commit comments

Comments
 (0)