Merge branch 'release/v0.2.2'

Schweigi · Sep 16, 2014 · 8a4e7e9 · 8a4e7e9
2 parents e433fce + 700ffc7
commit 8a4e7e9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/assets/asmsimulator.js b/assets/asmsimulator.js
@@ -396,11 +396,11 @@ var app = angular.module('ASMSimulator', []);;app.service('assembler', ['opcodes
 
                                     if (p1.type === "register")
                                         opCode = opcodes.DIV_REG;
-                                    if (p1.type === "regaddress")
+                                    else if (p1.type === "regaddress")
                                         opCode = opcodes.DIV_REGADDRESS;
-                                    if (p1.type === "address")
+                                    else if (p1.type === "address")
                                         opCode = opcodes.DIV_ADDRESS;
-                                    if (p1.type === "number")
+                                    else if (p1.type === "number")
                                         opCode = opcodes.DIV_NUMBER;
                                     else
                                         throw "DIV does not support this operand";
@@ -533,7 +533,8 @@ var app = angular.module('ASMSimulator', []);;app.service('assembler', ['opcodes
             return { code: code, mapping: mapping };
         }
     };
-}]);;app.service('cpu', ['opcodes', 'memory', function(opcodes, memory) {
+}]);
+;app.service('cpu', ['opcodes', 'memory', function(opcodes, memory) {
     var cpu = {
         step: function() {
             var self = this;