Miroirs/waforth
1
0
Fork 0
mirror of https://github.com/remko/waforth synced 2024-12-26 09:59:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add leb128u function + simplify emit

Browse source
This commit is contained in:
Remko Tronçon 2022-12-13 20:47:22 +01:00
parent 4f16403e04
commit 4b09a4f52a
2 changed files with 52 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/waforth.wat
View file

@ -2745,7 +2745,7 @@
(func $emitBr (param $n i32) (call $emit1 (i32.const 0x0c) (local.get $n)))
(func $emitBrIf (param $n i32) (call $emit1 (i32.const 0x0d) (local.get $n)))
(func $emitSetLocal (param $n i32)
(call $emit1v (i32.const 0x21) (local.get $n))
(call $emit1 (i32.const 0x21) (local.get $n))
(global.set $lastEmitWasGetTOS (i32.eqz (local.get $n))))
(func $emitGetLocal (param $n i32)
(block
@ -2757,8 +2757,8 @@
(i32.store8 (i32.sub (global.get $cp) (i32.const 2)) (i32.const 0x22))
(global.set $lastEmitWasGetTOS (i32.const 0))
(return))
(call $emit1v (i32.const 0x20) (local.get $n)))
(func $emitTeeLocal (param $n i32) (call $emit1v (i32.const 0x22) (local.get $n)))
(call $emit1 (i32.const 0x20) (local.get $n)))
(func $emitTeeLocal (param $n i32) (call $emit1 (i32.const 0x22) (local.get $n)))
(func $emitAdd (call $emit0 (i32.const 0x6a)))
(func $emitSub (call $emit0 (i32.const 0x6b)))
(func $emitXOR (call $emit0 (i32.const 0x73)))
@ -2772,30 +2772,25 @@
(func $emitLoad (call $emit2 (i32.const 0x28) (i32.const 0x02 (; align ;)) (i32.const 0x00 (; offset ;))))
(func $emit0 (param $op i32)
(call $emit (local.get $op))
(global.set $cp (call $leb128u (global.get $cp) (local.get $op)))
(global.set $lastEmitWasGetTOS (i32.const 0)))
(func $emit1v (param $op i32) (param $i1 i32)
(call $emit (local.get $op))
(global.set $cp (call $leb128u (global.get $cp) (local.get $op)))
(global.set $cp (call $leb128 (global.get $cp) (local.get $i1)))
(global.set $lastEmitWasGetTOS (i32.const 0)))
(func $emit1 (param $op i32) (param $i1 i32)
(call $emit (local.get $op))
(call $emit (local.get $i1))
(global.set $cp (call $leb128u (global.get $cp) (local.get $op)))
(global.set $cp (call $leb128u (global.get $cp) (local.get $i1)))
(global.set $lastEmitWasGetTOS (i32.const 0)))
(func $emit2 (param $op i32) (param $i1 i32) (param $i2 i32)
(call $emit (local.get $op))
(call $emit (local.get $i1))
(call $emit (local.get $i2))
(global.set $cp (call $leb128u (global.get $cp) (local.get $op)))
(global.set $cp (call $leb128u (global.get $cp) (local.get $i1)))
(global.set $cp (call $leb128u (global.get $cp) (local.get $i2)))
(global.set $lastEmitWasGetTOS (i32.const 0)))
(func $emit (param $v i32)
(i32.store8 (global.get $cp) (local.get $v))
(global.set $cp (i32.add (global.get $cp) (i32.const 1))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Compilation state
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -3019,6 +3014,17 @@
(br_if $loop (local.get $more)))
(local.get $p))
(func $leb128u (export "leb128u") (param $p i32) (param $value i32) (result i32)
(local $byte i32)
(loop $loop
(local.set $byte (i32.and (i32.const 0x7F) (local.get $value)))
(local.set $value (i32.shr_u (local.get $value) (i32.const 7)))
(if (i32.eqz (local.get $value)) (then) (else (local.set $byte (i32.or (local.get $byte) (i32.const 0x80)))))
(i32.store8 (local.get $p) (local.get $byte))
(local.set $p (i32.add (local.get $p) (i32.const 1)))
(br_if $loop (local.get $value)))
(local.get $p))
(func $body (param $xt i32) (result i32)
(i32.and
(i32.add

31
src/web/tests/suite.js
View file

@ -171,6 +171,37 @@ function loadTests() {
});
});
describe("leb128u", () => {
it("should convert 0x0", () => {
const r = core.leb128u(0x0, 0x0);
expect(r).to.eql(0x1);
expect(memory8[0]).to.eql(0x0);
});
it("should convert 0x17", () => {
const r = core.leb128u(0x0, 0x17);
expect(r).to.eql(0x1);
expect(memory8[0]).to.eql(0x17);
});
it("should convert 0x73", () => {
const r = core.leb128u(0x0, 0x73);
expect(r).to.eql(0x1);
expect(memory8[0]).to.eql(0x73);
});
it("should convert 0x80", () => {
const r = core.leb128u(0x0, 0x80);
expect(r).to.eql(0x2);
expect(memory8[0]).to.eql(0x80);
expect(memory8[1]).to.eql(0x01);
});
it("should convert 0x12345", () => {
const r = core.leb128(0x0, 0x12345);
expect(r).to.eql(0x3);
expect(memory8[0]).to.eql(0xc5);
expect(memory8[1]).to.eql(0xc6);
expect(memory8[2]).to.eql(0x04);
});
});
describe("leb128-4p", () => {
it("should convert 0x0", () => {
expect(core.leb128_4p(0x0)).to.eql(0x808080);