porffor 0.14.0-f67c123a1 β†’ 0.16.0-594397507

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CONTRIBUTING.md CHANGED
@@ -98,7 +98,7 @@ Loads the character code at the pointer `pointer` **for a String**.[^1]
98
98
  Porffor.wasm.i32.store(pointer, length, 0, 0)
99
99
  ```
100
100
 
101
- Stores the length `length` at pointer `pointer`, setting the length of an object. This is mostly unneeded today as you can just do `obj.length = length`. [^2]
101
+ Stores the length `length` at pointer `pointer`, setting the length of an object. This is mostly unneeded today as you can just do `obj.length = length`. (The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `0` byte offset).
102
102
 
103
103
  <br>
104
104
 
@@ -198,11 +198,15 @@ Store the character code into the `out` pointer variable, and increment it.
198
198
 
199
199
  ## Porffor-specific TS notes
200
200
 
201
- - For declaring variables, you must use explicit type annotations currently (eg `let a: number = 1`, not `let a = 1`)
201
+ - For declaring variables, you must use explicit type annotations currently (eg `let a: number = 1`, not `let a = 1`).
202
202
  - You might spot `Porffor.fastOr`/`Porffor.fastAnd`, these are non-short circuiting versions of `||`/`&&`, taking any number of conditions as arguments. You shouldn't don't need to use or worry about these.
203
- - **There are ~no objects, you cannot use them/literals.**
203
+ - **There are ~no objects, you cannot use them.**
204
204
  - Attempt to avoid string/array-heavy code and use more variables instead if possible, easier on memory and CPU/perf.
205
205
  - Do not set a return type for prototype methods, it can cause errors/unexpected results.
206
+ - You cannot use other functions in the file not exported, or variables not inside the current function.
207
+ - `if (...)` uses a fast truthy implementation which is not spec-compliant as most conditions should be strictly checked. To use spec-compliant behavior, use `if (Boolean(...))`.
208
+ - For object (string/array/etc) literals, you must use a variable eg `const out: bytestring = 'foobar'; console.log(out);` instead of `console.log('foobar')` due to precompile's allocator constraints.
209
+ - Generally prefer/use non-strict equality ops (`==`/`!=`).
206
210
 
207
211
  <br>
208
212
 
@@ -229,9 +233,13 @@ builtins/tostring_number: impl radix
229
233
 
230
234
  ## Test262
231
235
 
232
- Make sure you have Test262 cloned already **inside of `test262/`** (`git clone https://github.com/tc39/test262.git test262/test262`) and run `npm install` inside `test262/` too.
236
+ For the first time, ensure you run `./test262/setup.sh`.
233
237
 
234
- Run `node test262` to run all the tests and get an output of total overall test results. The main thing you want to pay attention to is the emoji summary (lol):
238
+ Run `node test262` to run all the tests and get an output of total overall test results.
239
+
240
+ Warning: this will consume 1-6GB of memory and ~90% of all CPU cores while running (depending on thread count), it should take 15-120s depending on machine. You can specify how many threads with `--threads=N`, it will use the number of CPU threads by default.
241
+
242
+ The main thing you want to pay attention to is the emoji summary (lol):
235
243
  ```
236
244
  πŸ§ͺ 50005 | 🀠 7007 (-89) | ❌ 1914 (-32) | πŸ’€ 13904 (-61) | πŸ“ 23477 (-120) | ⏰ 2 | πŸ— 2073 (+302) | πŸ’₯ 1628
237
245
  ```
@@ -239,7 +247,7 @@ Run `node test262` to run all the tests and get an output of total overall test
239
247
  To break this down:
240
248
  πŸ§ͺ total 🀠 pass ❌ fail πŸ’€ runtime error πŸ“ todo (error) ⏰ timeout πŸ—οΈ wasm compile error πŸ’₯ compile error
241
249
 
242
- The diff compared to the last commit (with test262 data) is shown in brackets. Basically, you can passes 🀠 up, and errors πŸ’€πŸ“πŸ—πŸ’₯ down. It is fine if some errors change balance/etc, as long as they are not new failures.
250
+ The diff compared to the last commit (with test262 data) is shown in brackets. Basically, you want passes 🀠 up, and errors πŸ’€πŸ“πŸ—πŸ’₯ down. It is fine if some errors change balance/etc, as long as they are not new failures.
243
251
 
244
252
  It will also log new passes/fails. Be careful as sometimes the overall passes can increase, but other files have also regressed into failures which you might miss. Also keep in mind some tests may have been false positives before, but we can investigate the diff together :)
245
253
 
@@ -251,6 +259,4 @@ It will also log new passes/fails. Be careful as sometimes the overall passes ca
251
259
 
252
260
  <br>
253
261
 
254
- [^1]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `4` byte offset for length).
255
-
256
- [^2]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `0` byte offset).
262
+ [^1]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `4` byte offset for length).
package/README.md CHANGED
@@ -14,7 +14,7 @@ Porffor is primarily built from scratch, the only thing that is not is the parse
14
14
  Expect nothing to work! Only very limited JS is currently supported. See files in `bench` for examples.
15
15
 
16
16
  ### Install
17
- **`npm install -g porffor`**. It's that easy (hopefully) :)
17
+ **`npm install -g porffor@latest`**. It's that easy (hopefully) :)
18
18
 
19
19
  ### Trying a REPL
20
20
  **`porf`**. Just run it with no script file argument.
@@ -266,8 +266,6 @@ Basically none right now (other than giving people headaches). Potential ideas:
266
266
  No particular order and no guarentees, just what could happen soonβ„’
267
267
 
268
268
  - Arrays
269
- - More of `Array` prototype
270
- - Arrays/strings inside arrays
271
269
  - Destructuring
272
270
  - Objects
273
271
  - Basic object expressions (eg `{}`, `{ a: 0 }`)
@@ -315,16 +313,10 @@ Porffor intentionally does not use Wasm proposals which are not commonly impleme
315
313
 
316
314
  - Multi-value **(required)**
317
315
  - Non-trapping float-to-int conversions **(required)**
318
- - Bulk memory operations (required, but uncommonly used)
319
- - Exception handling (optional, for errors)
316
+ - Bulk memory operations (optional, can get away without sometimes)
317
+ - Exception handling (optional, only for errors)
320
318
  - Tail calls (opt-in, off by default)
321
319
 
322
- ## Isn't this the same as AssemblyScript/other Wasm langs?
323
- No. they are not alike at all internally and have very different goals/ideals:
324
- - Porffor is made as a generic JS engine, not for Wasm stuff specifically
325
- - Porffor primarily consumes JS
326
- - Porffor is written in pure JS and compiles itself, not using Binaryen/etc
327
- - (Also I didn't know it existed when I started this, lol)
328
320
 
329
321
  ## FAQ
330
322
 
@@ -338,5 +330,9 @@ No. they are not alike at all internally and have very different goals/ideals:
338
330
  ### 2. Why at all?
339
331
  Yes!
340
332
 
341
- ### 3. But what about spec compliance?
342
- Lol, no. (sorry.)
333
+ ## 3. Isn't this the same as AssemblyScript/other Wasm langs?
334
+ No. they are not alike at all internally and have very different goals/ideals:
335
+ - Porffor is made as a generic JS engine, not for Wasm stuff specifically
336
+ - Porffor primarily consumes JS
337
+ - Porffor is written in pure JS and compiles itself, not using Binaryen/etc
338
+ - (Also I didn't know it existed when I started this, lol)
package/asur/index.js CHANGED
@@ -1155,7 +1155,7 @@ if (bc.porfFunc && paused && op) {
1155
1155
  switch (byg(
1156
1156
  paused,
1157
1157
  funcLines[currentFunc] + currentLine,
1158
- '\x1b[1masur\x1b[22m: ' + callStack.join(' -> ') + (parents.length > 1 ? \` | \${parents.slice(1).map(x => invOpcodes[x.opcode]).join(' -> ')}\` : ''),
1158
+ '\x1b[1masur debugger\x1b[22m: ' + callStack.join(' -> ') + (parents.length > 1 ? \` | \${parents.slice(1).map(x => invOpcodes[x.opcode]).join(' -> ')}\` : ''),
1159
1159
  [
1160
1160
  {
1161
1161
  x: termWidth - 1 - width - 6,
package/compiler/2c.js CHANGED
@@ -119,6 +119,9 @@ const removeBrackets = str => {
119
119
  };
120
120
 
121
121
  export default ({ funcs, globals, tags, data, exceptions, pages }) => {
122
+ // fix declaring order for c
123
+ funcs.reverse();
124
+
122
125
  const invOperatorOpcode = Object.values(operatorOpcode).reduce((acc, x) => {
123
126
  for (const k in x) {
124
127
  acc[x[k]] = k;
@@ -156,6 +159,11 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
156
159
  prependMain.set('_data', data.map(x => `memcpy(_memory + ${x.offset}, (unsigned char[]){${x.bytes.join(',')}}, ${x.bytes.length});`).join('\n'));
157
160
  }
158
161
 
162
+ if (importFuncs.find(x => x.name === '__Porffor_readArgv')) {
163
+ prepend.set('argv', `int _argc; char** _argv;`);
164
+ prependMain.set('argv', `_argc = argc; _argv = argv;`);
165
+ }
166
+
159
167
  if (out) out += '\n';
160
168
 
161
169
  let depth = 1;
@@ -199,6 +207,8 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
199
207
  depth = 1;
200
208
  brDepth = 0;
201
209
 
210
+ let retTmpId = 0;
211
+
202
212
  const invLocals = inv(f.locals, x => x.idx);
203
213
 
204
214
  for (const x in invLocals) {
@@ -207,8 +217,9 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
207
217
 
208
218
  const returns = f.returns.length > 0;
209
219
 
210
- const shouldInline = f.internal;
211
- out += `${f.name === 'main' ? 'int' : (f.internal ? (returns ? CValtype.f64 : 'void') : 'struct ReturnValue')} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')}) {\n`;
220
+ const shouldInline = false; // f.internal;
221
+ if (f.name === 'main') out += `int main(${prependMain.has('argv') ? 'int argc, char* argv[]' : ''}) {\n`;
222
+ else out += `${f.internal ? (returns ? CValtype.f64 : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')}) {\n`;
212
223
 
213
224
  if (f.name === 'main') {
214
225
  out += [...prependMain.values()].join('\n');
@@ -459,6 +470,60 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
459
470
  winIncludes.set('windows.h', true);
460
471
  break;
461
472
 
473
+ case '__Porffor_readArgv':
474
+ includes.set('stdlib.h', true);
475
+
476
+ prepend.set('__Porffor_readArgv',
477
+ `void __Porffor_readArgv(u32 index, u32 outPtr) {
478
+ if (index >= _argc) {
479
+ printf("expected %d arguments\\n", index);
480
+ exit(1);
481
+ }
482
+
483
+ char* arg = _argv[index];
484
+
485
+ u32 read = 0;
486
+ char* out = _memory + outPtr + 4;
487
+ char ch;
488
+ while ((ch = *(arg++)) != 0) {
489
+ out[read++] = ch;
490
+ }
491
+
492
+ memcpy(_memory + outPtr, &read, sizeof(read));
493
+ }`);
494
+
495
+ line(`__Porffor_readArgv((u32)(${vals.at(-2)}), (u32)(${vals.pop()}))`);
496
+ vals.pop();
497
+ break;
498
+
499
+ case '__Porffor_readFile':
500
+ includes.set('stdio.h', true);
501
+ includes.set('stdlib.h', true);
502
+
503
+ prepend.set('__Porffor_readFile',
504
+ `void __Porffor_readFile(u32 pathPtr, u32 outPtr) {
505
+ char* path = _memory + pathPtr + 4;
506
+ FILE* fp = fopen(path, "r");
507
+ if (fp == NULL) {
508
+ printf("failed to open file: %s\\n", path);
509
+ exit(1);
510
+ }
511
+
512
+ u32 read = 0;
513
+ char* out = _memory + outPtr + 4;
514
+ char ch;
515
+ while ((ch = fgetc(fp)) != EOF) {
516
+ out[read++] = ch;
517
+ }
518
+
519
+ fclose(fp);
520
+
521
+ memcpy(_memory + outPtr, &read, sizeof(read));
522
+ }`);
523
+ line(`__Porffor_readFile((u32)(${vals.at(-2)}), (u32)(${vals.pop()}))`);
524
+ vals.pop();
525
+ break;
526
+
462
527
  default:
463
528
  log.warning('2c', `unimplemented import: ${importFunc.name}`);
464
529
  break;
@@ -474,7 +539,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
474
539
  if (func.internal) {
475
540
  vals.push(`${sanitize(func.name)}(${args.join(', ')})`);
476
541
  } else {
477
- line(`const struct ReturnValue _ = ${sanitize(func.name)}(${args.join(', ')})`);
542
+ line(`const struct ReturnValue _${retTmpId++} = ${sanitize(func.name)}(${args.join(', ')})`);
478
543
  vals.push(`_.value`);
479
544
  vals.push(`_.type`);
480
545
  }
@@ -65,6 +65,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
65
65
  importFuncs = [...imports.values()];
66
66
 
67
67
  // fix call indexes for non-imports
68
+ // also fix call_indirect types
68
69
  const delta = importedFuncs.length - importFuncs.length;
69
70
  for (const f of funcs) {
70
71
  f.originalIndex = f.index;
@@ -74,6 +75,16 @@ export default (funcs, globals, tags, pages, data, flags) => {
74
75
  if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
75
76
  inst[1] -= delta;
76
77
  }
78
+
79
+ if (inst[0] === Opcodes.call_indirect) {
80
+ const params = [];
81
+ for (let i = 0; i < inst[1]; i++) {
82
+ params.push(valtypeBinary, Valtype.i32);
83
+ }
84
+
85
+ const returns = [ valtypeBinary, Valtype.i32 ];
86
+ inst[1] = getType(params, returns);
87
+ }
77
88
  }
78
89
  }
79
90
  }
@@ -101,10 +112,24 @@ export default (funcs, globals, tags, pages, data, flags) => {
101
112
  encodeVector([ [
102
113
  0x00,
103
114
  Opcodes.i32_const, 0, Opcodes.end,
104
- encodeVector(funcs.map(x => x.index))
115
+ ...encodeVector(funcs.map(x => x.index))
105
116
  ] ])
106
117
  );
107
118
 
119
+ if (pages.has('func argc lut')) {
120
+ // generate func argc lut data
121
+ const bytes = [];
122
+ for (let i = 0; i < funcs.length; i++) {
123
+ const argc = Math.floor(funcs[i].params.length / 2);
124
+ bytes.push(argc % 256, (argc / 256 | 0) % 256);
125
+ }
126
+
127
+ data.push({
128
+ offset: pages.get('func argc lut').ind * pageSize,
129
+ bytes
130
+ });
131
+ }
132
+
108
133
  // const t0 = performance.now();
109
134
 
110
135
  // specially optimized assembly for globals as this version is much (>5x) faster than traditional createSection()
@@ -1,4 +1,5 @@
1
1
  // @porf --valtype=i32
2
+ import type {} from './porffor.d.ts';
2
3
 
3
4
  export const __String_prototype_trimLeft = (_this: string) => {
4
5
  return __String_prototype_trimStart(_this);
@@ -1,3 +1,5 @@
1
+ import type {} from './porffor.d.ts';
2
+
1
3
  export const __Array_isArray = (x: unknown): boolean =>
2
4
  // Porffor.wasm`local.get ${x+1}` == Porffor.TYPES.array;
3
5
  Porffor.rawType(x) == Porffor.TYPES.array;
@@ -27,14 +29,16 @@ export const __Array_prototype_slice = (_this: any[], start: number, end: number
27
29
  let outPtr: i32 = Porffor.wasm`local.get ${out}`;
28
30
  let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
29
31
 
30
- const thisPtrEnd: i32 = thisPtr + end * 8;
32
+ const thisPtrEnd: i32 = thisPtr + end * 9;
31
33
 
32
- thisPtr += start * 8;
34
+ thisPtr += start * 9;
33
35
 
34
36
  while (thisPtr < thisPtrEnd) {
35
37
  Porffor.wasm.f64.store(outPtr, Porffor.wasm.f64.load(thisPtr, 0, 4), 0, 4);
36
- thisPtr += 8;
37
- outPtr += 8;
38
+ Porffor.wasm.i32.store8(outPtr + 8, Porffor.wasm.i32.load8_u(thisPtr + 8, 0, 4), 0, 4);
39
+
40
+ thisPtr += 9;
41
+ outPtr += 9;
38
42
  }
39
43
 
40
44
  out.length = end - start;
@@ -142,4 +146,80 @@ export const __Array_prototype_toReversed = (_this: any[]) => {
142
146
 
143
147
  export const __Array_prototype_valueOf = (_this: any[]) => {
144
148
  return _this;
149
+ };
150
+
151
+
152
+ export const __Array_prototype_forEach = (_this: any[], callbackFn: any) => {
153
+ const len: i32 = _this.length;
154
+ let i: i32 = 0;
155
+ while (i < len) {
156
+ callbackFn(_this[i], i++, _this);
157
+ }
158
+ };
159
+
160
+ export const __Array_prototype_filter = (_this: any[], callbackFn: any) => {
161
+ const out: any[] = [];
162
+
163
+ const len: i32 = _this.length;
164
+ let i: i32 = 0;
165
+ while (i < len) {
166
+ const el: any = _this[i];
167
+ if (Boolean(callbackFn(el, i++, _this))) out.push(el);
168
+ }
169
+
170
+ return out;
171
+ };
172
+
173
+ export const __Array_prototype_map = (_this: any[], callbackFn: any) => {
174
+ const out: any[] = [];
175
+
176
+ const len: i32 = _this.length;
177
+ let i: i32 = 0;
178
+ while (i < len) {
179
+ out.push(callbackFn(_this[i], i++, _this));
180
+ }
181
+
182
+ return out;
183
+ };
184
+
185
+ export const __Array_prototype_find = (_this: any[], callbackFn: any) => {
186
+ const len: i32 = _this.length;
187
+ let i: i32 = 0;
188
+ while (i < len) {
189
+ const el: any = _this[i];
190
+ if (Boolean(callbackFn(el, i++, _this))) return el;
191
+ }
192
+ };
193
+
194
+ export const __Array_prototype_findLast = (_this: any[], callbackFn: any) => {
195
+ let i: i32 = _this.length;
196
+ while (i > 0) {
197
+ const el: any = _this[--i];
198
+ if (Boolean(callbackFn(el, i, _this))) return el;
199
+ }
200
+ };
201
+
202
+ export const __Array_prototype_findIndex = (_this: any[], callbackFn: any) => {
203
+ const len: i32 = _this.length;
204
+ let i: i32 = 0;
205
+ while (i < len) {
206
+ if (Boolean(callbackFn(_this[i], i++, _this))) return i;
207
+ }
208
+ };
209
+
210
+ export const __Array_prototype_findLastIndex = (_this: any[], callbackFn: any) => {
211
+ let i: i32 = _this.length;
212
+ while (i > 0) {
213
+ if (Boolean(callbackFn(_this[--i], i, _this))) return i;
214
+ }
215
+ };
216
+
217
+ export const __Array_prototype_every = (_this: any[], callbackFn: any) => {
218
+ const len: i32 = _this.length;
219
+ let i: i32 = 0;
220
+ while (i < len) {
221
+ if (!Boolean(callbackFn(_this[i], i++, _this))) return false;
222
+ }
223
+
224
+ return true;
145
225
  };
@@ -1,4 +1,5 @@
1
1
  // @porf --valtype=i32
2
+ import type {} from './porffor.d.ts';
2
3
 
3
4
  export const btoa = (input: bytestring): bytestring => {
4
5
  const keyStr: bytestring = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -1,3 +1,5 @@
1
+ import type {} from './porffor.d.ts';
2
+
1
3
  // 20.3.3.2 Boolean.prototype.toString ()
2
4
  // https://tc39.es/ecma262/#sec-boolean.prototype.tostring
3
5
  export const __Boolean_prototype_toString = (_this: boolean) => {
@@ -15,4 +17,4 @@ export const __Boolean_prototype_toString = (_this: boolean) => {
15
17
  export const __Boolean_prototype_valueOf = (_this: boolean) => {
16
18
  // 1. Return ? ThisBooleanValue(this value).
17
19
  return _this;
18
- };
20
+ };
@@ -0,0 +1,6 @@
1
+ import type {} from './porffor.d.ts';
2
+
3
+ export const __console_clear = () => {
4
+ const clear: bytestring = '\x1b[1;1H\x1b[J';
5
+ Porffor.print(clear);
6
+ };
@@ -1,4 +1,5 @@
1
1
  // @porf --valtype=i32
2
+ import type {} from './porffor.d.ts';
2
3
 
3
4
  export const __crypto_randomUUID = (): bytestring => {
4
5
  let bytes: bytestring = '................';
@@ -1,3 +1,5 @@
1
+ import type {} from './porffor.d.ts';
2
+
1
3
  // 21.4.1.3 Day (t)
2
4
  // https://tc39.es/ecma262/multipage/numbers-and-dates.html#sec-day
3
5
  // 1. Return 𝔽(floor(ℝ(t / msPerDay))).
@@ -0,0 +1,22 @@
1
+ export default () => {
2
+ let out = '';
3
+
4
+ const error = name => out += `export const ${name} = (message: bytestring) => {
5
+ return {};
6
+ };
7
+
8
+ export const ${name}$constructor = (message: bytestring) => {
9
+ return {};
10
+ };`;
11
+
12
+ error('Error');
13
+ error('AggregateError');
14
+ error('TypeError');
15
+ error('ReferenceError');
16
+ error('SyntaxError');
17
+ error('RangeError');
18
+ error('EvalError');
19
+ error('URIError');
20
+
21
+ return out;
22
+ };
@@ -1,6 +1,5 @@
1
1
  // @porf --valtype=i32
2
-
3
- import type {} from './porffor';
2
+ import type {} from './porffor.d.ts';
4
3
 
5
4
  export const escape = (input: string|bytestring): bytestring => {
6
5
  // we have no byte array yet so use bytestring with 0x00 and 0x01 via escape characters
@@ -1,3 +1,5 @@
1
+ import type {} from './porffor.d.ts';
2
+
1
3
  export const __Function_prototype_toString = (_this: Function) => {
2
4
  // todo: actually use source
3
5
  let out: bytestring = 'function () {}';
@@ -1,3 +1,5 @@
1
+ import type {} from './porffor.d.ts';
2
+
1
3
  // radix: number|any for rawType check
2
4
  // export const parseInt = (input: string|bytestring, radix: number|any): f64 => {
3
5
  export const parseInt = (input: string|bytestring, radix: number): f64 => {