java-class-tools - npm Package Compare versions

Comparing version 1.0.6 to 1.1.0

lib/instruction-parser.js

@@ -86,10 +86,140 @@ 'use strict';
   _createClass(InstructionParser, null, [{
-    key: 'fromBytecode',
+    key: 'toBytecode',
 
     /**
-     * Converts raw bytecode into instruction objects.
+     * Converts Instruction objects into raw bytecode.
      *
+     * @param {Instruction[]} instruction - Instructions to convert.
+     * @see {@link https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5}
+     */
+    value: function toBytecode(instructions) {
+      if (!Array.isArray(instructions)) {
+        throw TypeError('instructions must be an array.');
+      }
+
+      var bytecode = [];
+      var offset = 0;
+
+      while (offset < instructions.length) {
+        var current = instructions[offset];
+        bytecode.push(current.opcode);
+
+        switch (current.opcode) {
+          case _opcode2.default.LOOKUPSWITCH:
+            {
+              var padding = bytecode.length % 4 ? 4 - bytecode.length % 4 : 0;
+              var operandOffset = 0;
+
+              while (padding--) {
+                bytecode.push(0);
+              }
+
+              var defaultOffset = current.operands[operandOffset++] - 1;
+
+              bytecode.push(defaultOffset >> 24 & 0xFF, defaultOffset >> 16 & 0xFF, defaultOffset >> 8 & 0xFF, defaultOffset & 0xFF);
+
+              var npairs = current.operands[operandOffset++];
+
+              bytecode.push(npairs >> 24 & 0xFF, npairs >> 16 & 0xFF, npairs >> 8 & 0xFF, npairs & 0xFF);
+
+              while (npairs--) {
+                var npair = current.operands[operandOffset++];
+                var matchOffset = current.operands[operandOffset++] - 1;
+
+                bytecode.push(npair >> 24 & 0xFF, npair >> 16 & 0xFF, npair >> 8 & 0xFF, npair & 0xFF);
+                bytecode.push(matchOffset >> 24 & 0xFF, matchOffset >> 16 & 0xFF, matchOffset >> 8 & 0xFF, matchOffset & 0xFF);
+              }
+              break;
+            }
+
+          case _opcode2.default.TABLESWITCH:
+            {
+              var _padding = bytecode.length % 4 ? 4 - bytecode.length % 4 : 0;
+              var _operandOffset = 0;
+
+              while (_padding--) {
+                bytecode.push(0);
+              }
+
+              var _defaultOffset = current.operands[_operandOffset++] - 1;
+
+              bytecode.push(_defaultOffset >> 24 & 0xFF, _defaultOffset >> 16 & 0xFF, _defaultOffset >> 8 & 0xFF, _defaultOffset & 0xFF);
+
+              var low = current.operands[_operandOffset++];
+              var high = current.operands[_operandOffset++];
+
+              bytecode.push(low >> 24 & 0xFF, low >> 16 & 0xFF, low >> 8 & 0xFF, low & 0xFF);
+              bytecode.push(high >> 24 & 0xFF, high >> 16 & 0xFF, high >> 8 & 0xFF, high & 0xFF);
+
+              var jumpOffsets = high - low + 1;
+              while (jumpOffsets--) {
+                var jumpOffset = current.operands[_operandOffset++] - 1;
+                bytecode.push(jumpOffset >> 24 & 0xFF, jumpOffset >> 16 & 0xFF, jumpOffset >> 8 & 0xFF, jumpOffset & 0xFF);
+              }
+              break;
+            }
+
+          case _opcode2.default.WIDE:
+            {
+              var targetOpcode = current.operands[0];
+
+              switch (targetOpcode) {
+                case _opcode2.default.ILOAD:
+                case _opcode2.default.FLOAD:
+                case _opcode2.default.ALOAD:
+                case _opcode2.default.LLOAD:
+                case _opcode2.default.DLOAD:
+                case _opcode2.default.ISTORE:
+                case _opcode2.default.FSTORE:
+                case _opcode2.default.ASTORE:
+                case _opcode2.default.LSTORE:
+                case _opcode2.default.DSTORE:
+                case _opcode2.default.RET:
+                  bytecode.push(targetOpcode, current.operands[1], current.operands[2]);
+                  break;
+
+                case _opcode2.default.IINC:
+                  bytecode.push(targetOpcode, current.operands[1], current.operands[2], current.operands[3], current.operands[4]);
+                  break;
+
+                default:
+                  throw 'Unexpected wide opcode: ' + targetOpcode;
+              }
+              break;
+            }
+
+          default:
+            {
+              var operandCount = OPERAND_COUNT_MAP[current.opcode];
+
+              if (operandCount === undefined) {
+                throw Error('Unexpected opcode: ' + current);
+              }
+
+              if (current.operands.length > operandCount) {
+                throw Error('The number of operands in instruction: ' + current + ' is greater than the allowed.');
+              }
+
+              for (var i = 0; i < operandCount; i++) {
+                bytecode.push(current.operands[i]);
+              }
+              break;
+            }
+        }
+
+        offset++;
+      }
+
+      return bytecode;
+    }
+
+    /**
+     * Converts raw bytecode into Instruction objects.
+     *
      * @param {number[]} bytecode - An array of bytes containing the jvm bytecode.
      * @see {@link https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5}
      */
+
+  }, {
+    key: 'fromBytecode',
     value: function fromBytecode(bytecode) {
@@ -120,2 +250,4 @@ if (!Array.isArray(bytecode)) {
               var npairs = bytecode[offset++] << 24 | bytecode[offset++] << 16 | bytecode[offset++] << 8 | bytecode[offset++];
+              instruction.operands.push(npairs);
+
               while (npairs--) {
@@ -133,8 +265,8 @@ var npair = bytecode[offset++] << 24 | bytecode[offset++] << 16 | bytecode[offset++] << 8 | bytecode[offset++];
             {
-              var _padding = offset % 4 ? 4 - offset % 4 : 0;
-              offset += _padding; // Skip padding
+              var _padding2 = offset % 4 ? 4 - offset % 4 : 0;
+              offset += _padding2; // Skip padding
 
               // the "default" case offset
-              var _defaultOffset = bytecode[offset++] << 24 | bytecode[offset++] << 16 | bytecode[offset++] << 8 | bytecode[offset++];
-              instruction.operands.push(_defaultOffset + 1);
+              var _defaultOffset2 = bytecode[offset++] << 24 | bytecode[offset++] << 16 | bytecode[offset++] << 8 | bytecode[offset++];
+              instruction.operands.push(_defaultOffset2 + 1);
 
@@ -144,2 +276,5 @@ var low = bytecode[offset++] << 24 | bytecode[offset++] << 16 | bytecode[offset++] << 8 | bytecode[offset++];
 
+              instruction.operands.push(low);
+              instruction.operands.push(high);
+
               var jumpOffsets = high - low + 1;
@@ -146,0 +281,0 @@ while (jumpOffsets--) {

package.json

 {
   "name": "java-class-tools",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "Read and write java class files in node or browser.",
@@ -14,3 +14,3 @@ "main": "lib/index.js",
   },
-  "files": [    
+  "files": [
     "index.js",
@@ -31,4 +31,4 @@ "lib"
   "scripts": {
-    "test": "./node_modules/.bin/mocha test/tests.js",
-    "build": "./node_modules/.bin/gulp"
+    "test": "\"./node_modules/.bin/mocha\" test/tests.js",
+    "build": "\"./node_modules/.bin/gulp\""
   },
@@ -40,6 +40,5 @@ "devDependencies": {
     "babel-preset-es2015": "^6.22.0",
-    "chalk": "^1.1.3",
-    "decompress-zip": "^0.3.0",
     "deep-equal": "^1.0.1",
     "fs-extra": "^2.0.0",
+    "gulp": "^3.9.1",
     "gulp-babel": "^6.1.2",
@@ -52,4 +51,3 @@ "gulp-cli": "^1.2.2",
     "mocha": "^3.2.0",
-    "tmp": "^0.0.31",
-    "webpack": "^2.2.1"
+    "tmp": "^0.0.31"
   },
@@ -56,0 +54,0 @@ "dependencies": {

README.md

 # java-class-tools
 
 ## Examples:
-[Live example](https://rawgit.com/leonardosnt/java-class-tools/master/examples/browser.html)
+- [Live example](https://rawgit.com/leonardosnt/java-class-tools/master/examples/browser.html)  
+- [Try yourself](https://runkit.com/leonardosnt/java-class-tools-example)  
 
@@ -10,3 +11,3 @@ Print all methods names
 
-const { JavaClassFileReader } = require('../');
+const { JavaClassFileReader } = require('java-class-tools');
 
@@ -13,0 +14,0 @@ const reader = new JavaClassFileReader();

New alerts

Copyleft License

License

(Experimental) Copyleft license information was found.

Found 1 instance in 1 package

Mixed license

License

(Experimental) Package contains multiple licenses.

Found 1 instance in 1 package

Non-permissive License

License

(Experimental) A license not known to be considered permissive was found.

Found 1 instance in 1 package

Fixed alerts

Copyleft License

License

(Experimental) Copyleft license information was found.

Found 1 instance in 1 package

Mixed license

License

(Experimental) Package contains multiple licenses.

Found 1 instance in 1 package

Non-permissive License

License

(Experimental) A license not known to be considered permissive was found.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

255235

112.6%

Dev dependency count

15

-11.76%

Number of package files

17

70%

Lines of code

1867

5.9%

Number of lines in readme file

32

3.23%

No dependency changes