simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-04 06:22:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #206 from RichardJamesC/master

Browse Source 
moved the overloaded parseDWInstruction() #197
This commit is contained in:
Simon Fortier 2019-06-18 20:40:36 -04:00 committed by GitHub
commit 50e0baa6ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Server/src/main/java/net/simon987/server/assembly/Assembler.java
View File

@ -219,6 +219,17 @@ public class Assembler {
return bos.toByteArray();
}
/**
* Parse the DW instruction (Define word). Handles DUP operator
*
* @param line Current line. assuming that comments and labels are removed
* @param currentLine Current line number
* @return Encoded instruction, null if the line is not a DW instruction
*/
private static byte[] parseDWInstruction(String line, int currentLine) throws AssemblyException {
return parseDWInstruction(line, null, currentLine);
}
/**
* Parse the dup operator
@ -271,17 +282,6 @@ public class Assembler {
}
/**
* Parse the DW instruction (Define word). Handles DUP operator
*
* @param line Current line. assuming that comments and labels are removed
* @param currentLine Current line number
* @return Encoded instruction, null if the line is not a DW instruction
*/
private static byte[] parseDWInstruction(String line, int currentLine) throws AssemblyException {
return parseDWInstruction(line, null, currentLine);
}
/**
* Check for and handle section declarations (.text and .data)
*