diff --git a/js/parseInputFile.js b/js/parseInputFile.js index ff3cc8e..b9dc045 100644 --- a/js/parseInputFile.js +++ b/js/parseInputFile.js @@ -301,12 +301,12 @@ function isValidMemoryLocation(memoryLocation) { memoryNumber = parseInt(memoryLocation); - if(memoryNumber) { - if(memoryNumber >= 0 && memoryNumber < 65280 && memoryNumber % 4 == 0) { + if(memoryNumber || memoryLocation == 0) { + if(memoryNumber >= 0 && memoryNumber < 65280) { isValid = true; } else { - warnings.push("Memory location " + memoryLocation + " must be greater than 0, less than 65280, and divisible by 4."); + warnings.push("Memory location " + memoryLocation + " must be greater than 0 and less than 65280"); } } else { diff --git a/sampleinputs/sample_1.txt b/sampleinputs/sample_1.txt index 3c2ca3a..c6a6280 100644 --- a/sampleinputs/sample_1.txt +++ b/sampleinputs/sample_1.txt @@ -9,6 +9,6 @@ CODE 10001100001000100000000000000000 00000000010000110010000000100000 10101100001001000000000000000000 -00010100000001000000000000000010 +00010100000001000000000000000001 00100000010000011111111111110111 -00000000001000110000100000100000 +00000000001000110000100000100000 \ No newline at end of file diff --git a/sampleinputs/sample_4.txt b/sampleinputs/sample_4.txt index 1352ea6..9ddb2fa 100644 --- a/sampleinputs/sample_4.txt +++ b/sampleinputs/sample_4.txt @@ -1,9 +1,5 @@ // This sample should not stall -// add rd, rs, rt -// rd = rs + rt -// 0000 00ss ssst tttt dddd d000 0010 0000 - // add r3, r1, r2 // add r4, r1, r2