Changeset 42

Timestamp:

05/17/11 11:56:15 (14 years ago)

Author:

jhall

Message:

• bugfix of LOWORD/HIWORD

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/EventGenerator.java (modified) (3 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/EventGenerator.java

@@ -400 +400 @@
                                         if( loword!=null ) {
                                                 paramValue = loHiWord(genMsgChild);
+                                                generatedMessage.setLPARAM(paramValue);
                                         } else {
                                                 try {
@@ -414 +415 @@
                                         if( loword!=null ) {
                                                 paramValue = loHiWord(genMsgChild);
+                                                generatedMessage.setWPARAM(paramValue);
                                         } else {
                                                 try {
@@ -727 +729 @@
                 String lowordStr = getTermValue(null, (Element) loword.getChildren().get(0));
                 String hiwordStr = getTermValue(null, (Element) hiword.getChildren().get(0));
-                return LOWORD(Integer.parseInt(lowordStr))+HIWORD(Integer.parseInt(hiwordStr));
+                return MAKEPARAM(Integer.parseInt(lowordStr), Integer.parseInt(hiwordStr));
         }
         
-        private static short LOWORD(long data) {
-                return (short) (data & 0xffff);
-        }
-
-        private static short HIWORD(long data) {
-                return (short) (data >> 16);
+        private static long MAKEPARAM(int loword, int hiword) {
+                return loword| ((long) hiword) << 32;
         }