@nirguna/plugin-fasm 1.1.1 → 1.3.0

package/lib/add-label-prefix/index.js

@@ -1,6 +1,10 @@
 import {types} from 'putout';
 
-const {isMemberExpression} = types;
+const {
+    isMemberExpression,
+    isAwaitExpression,
+} = types;
+
 const PREFIX = '__nirguna_';
 
 export const report = ({name, newName}) => `Add prefix to label: '${name}' -> '${newName}'`;
@@ -41,8 +45,16 @@ function getIds(path, name) {
             if (isMemberExpression(path.parentPath))
                 return;
             
-            if (name === path.node.name)
-                ids.push(path);
+            if (name !== path.node.name)
+                return;
+            
+            const calleePath = path.parentPath.get('callee');
+            const parentAwait = isAwaitExpression(path.parentPath.parentPath);
+            
+            if (!parentAwait && calleePath === path)
+                return;
+            
+            ids.push(path);
         },
     });
     

package/lib/convert-args-to-regs/index.js

@@ -3,6 +3,7 @@ import {
     types,
     operator,
 } from 'putout';
+import {TARGETS} from '#targets';
 
 const {
     replaceWithMultiple,
@@ -104,7 +105,19 @@ const BYTES = {
     i64: 8,
 };
 
+function getTarget({scope}) {
+    const programPath = scope.getProgramParent().path;
+    const {target} = programPath.node.extra;
+    
+    return target;
+}
+
 function getBytes(path) {
+    const target = getTarget(path);
+    
+    if (target)
+        return TARGETS[target].size;
+    
     const {returnType} = path.node;
     
     if (!returnType)
@@ -116,6 +129,14 @@ function getBytes(path) {
 }
 
 function getRegister(path, reg) {
+    const target = getTarget(path);
+    
+    if (target) {
+        const {bits} = TARGETS[target];
+        
+        return REG[bits][reg];
+    }
+    
     const {returnType} = path.node;
     
     if (!returnType)

package/lib/insert-target/index.js

@@ -1,26 +1,18 @@
 import {template} from 'putout';
+import {TARGETS} from '#targets';
 
-const createBinary = (address) => `{
-    org(${address});
-    use16();
-}`;
-
-const TARGET = {
-    boot: createBinary('0x7c00'),
-    kernel: createBinary('0x7e00'),
-    nemesis: createBinary('0x500'),
-    linux: `{
-        format.ELF64.executable;
-        entry.$;
-    }`,
+export const report = (path, {options}) => {
+    const {target} = options;
+    return `Insert target: '${target}'`;
 };
 
-export const report = (path, {target}) => `Insert target: '${target}'`;
-
 export const fix = (path, {options}) => {
     const {target} = options;
+    
     path.node.extra.target = target;
-    path.node.body.unshift(template.ast(TARGET[target]));
+    const {code} = TARGETS[target];
+    
+    path.node.body.unshift(template.ast(code));
 };
 
 export const include = () => ['Program'];
@@ -34,5 +26,5 @@ export const filter = (path, {options}) => {
     if (path.node.extra.target)
         return;
     
-    return TARGET[target];
+    return TARGETS[target];
 };

package/lib/split-binary-expression/index.js

@@ -24,8 +24,8 @@ export const replace = () => ({
             return '__a += __c';
         
         return `{
-    	__a = __b;
-        __a += __c
-    }`;
+            __a = __b;
+            __a += __c
+        }`;
     },
 });

package/lib/targets.js

@@ -0,0 +1,30 @@
+const createBinary = (address) => `{
+    org(${address});
+    use16();
+}`;
+
+export const TARGETS = {
+    linux: {
+        size: 8,
+        bits: 'i64',
+        code: `{
+            format.ELF64.executable;
+            entry.$;
+        }`,
+    },
+    kernel: {
+        size: 2,
+        bits: 'i16',
+        code: createBinary('0x7e00'),
+    },
+    boot: {
+        size: 2,
+        bits: 'i16',
+        code: createBinary('0x7c00'),
+    },
+    nemesis: {
+        size: 2,
+        bits: 'i16',
+        code: createBinary('0x500'),
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nirguna/plugin-fasm",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊nirguna plugin adds ability to optimize fasm",
@@ -13,6 +13,9 @@
     "type": "git",
     "url": "git+https://github.com/coderaiser/putout.git"
   },
+  "imports": {
+    "#targets": "./lib/targets.js"
+  },
   "scripts": {
     "test": "madrun test",
     "watch:test": "madrun watch:test",
@@ -35,7 +38,7 @@
   "devDependencies": {
     "@putout/plugin-remove-nested-blocks": "^9.1.0",
     "@putout/test": "^15.1.1",
-    "c8": "^10.0.0",
+    "c8": "^11.0.0",
     "eslint": "^10.0.1",
     "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-putout": "^31.0.1",