[Edumips64-commit] SF.net SVN: edumips64:[596] branches/0.5

[<sv...@ed...>]

Revision: 596
          https://www.edumips.org/changeset/596
Author:   lupino3
Date:     2011-06-02 16:58:27 +0200 (Thu, 02 Jun 2011)
Log Message:
-----------
Fixed a bug that made impossible to access odd memory locations from the code.

Modified Paths:
--------------
    branches/0.5/core/Parser.java
    branches/0.5/core/is/Instruction.java
    branches/0.5/edumips64-svn.jar

Modified: branches/0.5/core/Parser.java
===================================================================
--- branches/0.5/core/Parser.java	2011-06-02 14:22:45 UTC (rev 595)
+++ branches/0.5/core/Parser.java	2011-06-02 14:58:27 UTC (rev 596)
@@ -891,17 +891,15 @@
 												else if(isNumber(param.substring(indPar,endPar).trim()))
 												{
 													int tmp = Integer.parseInt(param.substring(indPar,endPar).trim());
-													if (tmp<0 || tmp%2!=0 || tmp > edumips64.core.CPU.DATALIMIT)
+													//if (tmp<0 || tmp%2!=0 || tmp > edumips64.core.CPU.DATALIMIT)
+													if (tmp<0 || tmp > edumips64.core.CPU.DATALIMIT)
 													{   
 															numError++;
 															String er = "LABELADDRESSINVALID";
 															if (tmp > edumips64.core.CPU.DATALIMIT) {
 															    er = "LABELTOOLARGE";
-															    error.add(er,row,line.indexOf(param.substring(indPar,endPar))+1,line);
                                                             }
-                                                            else {
-                                                                error.add("LABELADDRESSINVALID",row,line.indexOf(param.substring(indPar,endPar))+1,line);
-                                                            }
+                                                            error.add(er,row,line.indexOf(param.substring(indPar,endPar))+1,line);
 															i = line.length();
 															indPar = endPar+1;
 															tmpInst.getParams().add(0);

Modified: branches/0.5/core/is/Instruction.java
===================================================================
--- branches/0.5/core/is/Instruction.java	2011-06-02 14:22:45 UTC (rev 595)
+++ branches/0.5/core/is/Instruction.java	2011-06-02 14:58:27 UTC (rev 596)
@@ -24,6 +24,7 @@
 import edumips64.core.*;
 import edumips64.utils.*;
 import java.util.*;
+import java.util.logging.Logger;
 import java.lang.Enum.*;
 /**Abstract class: it provides all methods and attributes for each instruction type
  * 
@@ -42,6 +43,7 @@
     protected String fullname;
     protected static boolean enableForwarding=(Boolean)Config.get("forwarding");
     protected String label;
+    protected static final Logger logger = Logger.getLogger(Instruction.class.getName());
     
     /** Creates a new instance of Instruction */
     public Instruction() {

Modified: branches/0.5/edumips64-svn.jar
===================================================================
(Binary files differ)