university-projects/AsmCompiler
1
0
Fork 0
Code Pull Requests Releases Activity

Исправления в коде

Browse Source
This commit is contained in:
Victor 2014-03-22 18:45:13 +02:00
parent 36ab1b7c05
commit e240978379
7 changed files with 302 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/annimon/asm/directives/Add.java
View File

@ -103,8 +103,8 @@ public class Add extends Directive implements ISyntaxChecker, IListingGenerator
modreg <<= 6;
// r/m
if (strs[1].toLowerCase().indexOf("si") != -1) modreg |= 0b100;
else if (strs[1].toLowerCase().indexOf("di") != -1) modreg |= 0b101;
if (strs[1].toLowerCase().contains("si")) modreg |= 0b100;
else if (strs[1].toLowerCase().contains("di")) modreg |= 0b101;
else modreg |= 0b110;
sb.append(ListingGenerateHelper.toHexString(val))

4
src/com/annimon/asm/directives/ByteRegister.java
View File

@ -6,10 +6,6 @@ package com.annimon.asm.directives;
*/
public class ByteRegister extends Register {
public ByteRegister() {
super();
}
@Override
public int getId() {
return ID.REGISTER_BYTE;

9
src/com/annimon/asm/directives/ByteValue.java
View File

@ -6,10 +6,6 @@ package com.annimon.asm.directives;
*/
public class ByteValue extends NumericValue {
public ByteValue() {
super();
}
@Override
public int getId() {
return ID.NUMBER_BYTE;
@ -18,10 +14,7 @@ public class ByteValue extends NumericValue {
@Override
protected boolean checkRange(Integer value) {
if (value == null) return false;
if ( (-128 <= value.intValue()) && (value.intValue() <= 255) ) {
return true;
}
return false;
return (-128 <= value) && (value <= 255);
}
}

4
src/com/annimon/asm/directives/InfinityValue.java
View File

@ -6,10 +6,6 @@ package com.annimon.asm.directives;
*/
public class InfinityValue extends NumericValue {
public InfinityValue() {
super();
}
@Override
public int getId() {
return ID.NUMBER_INFINITY;

4
src/com/annimon/asm/directives/Register.java
View File

@ -13,8 +13,8 @@ public abstract class Register extends Directive {
@Override
public boolean isDirective(String text) {
String[] names = getRegisterNames();
for (int i = 0; i < names.length; i++) {
if (text.equalsIgnoreCase(names[i])) {
for (String register : names) {
if (text.equalsIgnoreCase(register)) {
return true;
}
}

4
src/com/annimon/asm/directives/WordRegister.java
View File

@ -6,10 +6,6 @@ package com.annimon.asm.directives;
*/
public class WordRegister extends Register {
public WordRegister() {
super();
}
@Override
public int getId() {
return ID.REGISTER_WORD;

9
src/com/annimon/asm/directives/WordValue.java
View File

@ -6,10 +6,6 @@ package com.annimon.asm.directives;
*/
public class WordValue extends NumericValue {
public WordValue() {
super();
}
@Override
public int getId() {
return ID.NUMBER_WORD;
@ -18,10 +14,7 @@ public class WordValue extends NumericValue {
@Override
protected boolean checkRange(Integer value) {
if (value == null) return false;
if ( (-32768 <= value.intValue()) && (value.intValue() <= 65535) ) {
return true;
}
return false;
return (-32768 <= value) && (value <= 65535);
}
}