update

wqzgh · Apr 24, 2015 · a09294c · a09294c
1 parent 0bd1577
commit a09294c
Show file tree

Hide file tree

Showing 6 changed files with 263 additions and 161 deletions.
diff --git a/IodineGBA/IodineGBA/CPU/ARMInstructionSetCore.js b/IodineGBA/IodineGBA/CPU/ARMInstructionSetCore.js
diff --git a/IodineGBA/IodineGBA/GameBoyAdvanceTimerCore.js b/IodineGBA/IodineGBA/GameBoyAdvanceTimerCore.js
@@ -2,7 +2,7 @@
 /*
  * This file is part of IodineGBA
  *
- * Copyright (C) 2012-2014 Grant Galitz
+ * Copyright (C) 2012-2015 Grant Galitz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

diff --git a/IodineGBA/IodineGBA/memory/GameBoyAdvanceDMA0Core.js b/IodineGBA/IodineGBA/memory/GameBoyAdvanceDMA0Core.js
@@ -248,11 +248,11 @@ GameBoyAdvanceDMA0.prototype.handleDMACopy = function () {
     //Transfer Data:
     if ((this.is32Bit | 0) == 4) {
         //32-bit Transfer:
-        this.copy32(source | 0, destination | 0);
+        this.copy32(source & -4, destination & -4);
     }
     else {
         //16-bit Transfer:
-        this.copy16(source | 0, destination | 0);
+        this.copy16(source & -2, destination & -2);
     }
 }
 GameBoyAdvanceDMA0.prototype.copy16 = function (source, destination) {

diff --git a/IodineGBA/IodineGBA/memory/GameBoyAdvanceDMA1Core.js b/IodineGBA/IodineGBA/memory/GameBoyAdvanceDMA1Core.js
@@ -263,18 +263,18 @@ GameBoyAdvanceDMA1.prototype.handleDMACopy = function () {
     //Transfer Data:
     if ((this.enabled | 0) == 0x8) {
         //32-bit Transfer:
-        this.copySound(source | 0);
+        this.copySound(source & -4);
     }
     else {
         //Get the destination address:
         var destination = this.destinationShadow | 0;
         if ((this.is32Bit | 0) == 4) {
             //32-bit Transfer:
-            this.copy32(source | 0, destination | 0);
+            this.copy32(source & -4, destination & -4);
         }
         else {
             //16-bit Transfer:
-            this.copy16(source | 0, destination | 0);
+            this.copy16(source & -2, destination & -2);
         }
     }
 }

diff --git a/IodineGBA/IodineGBA/memory/GameBoyAdvanceDMA2Core.js b/IodineGBA/IodineGBA/memory/GameBoyAdvanceDMA2Core.js
@@ -262,18 +262,18 @@ GameBoyAdvanceDMA2.prototype.handleDMACopy = function () {
     //Transfer Data:
     if ((this.enabled | 0) == 0x10) {
         //32-bit Transfer:
-        this.copySound(source | 0);
+        this.copySound(source & -4);
     }
     else {
         //Get the destination address:
         var destination = this.destinationShadow | 0;
         if ((this.is32Bit | 0) == 4) {
             //32-bit Transfer:
-            this.copy32(source | 0, destination | 0);
+            this.copy32(source & -4, destination & -4);
         }
         else {
             //16-bit Transfer:
-            this.copy16(source | 0, destination | 0);
+            this.copy16(source & -2, destination & -2);
         }
     }
 }

diff --git a/IodineGBA/IodineGBA/memory/GameBoyAdvanceDMA3Core.js b/IodineGBA/IodineGBA/memory/GameBoyAdvanceDMA3Core.js
@@ -276,11 +276,11 @@ GameBoyAdvanceDMA3.prototype.handleDMACopy = function () {
     //Transfer Data:
     if ((this.is32Bit | 0) == 4) {
         //32-bit Transfer:
-        this.copy32(source | 0, destination | 0);
+        this.copy32(source & -4, destination & -4);
     }
     else {
         //16-bit Transfer:
-        this.copy16(source | 0, destination | 0);
+        this.copy16(source & -2, destination & -2);
     }
 }
 GameBoyAdvanceDMA3.prototype.copy16 = function (source, destination) {