Skip to content

Commit b353017

Browse files
virgil-serbanutarv-auditorjberthold
authored
Remove MapIntToInt (#649)
* Remove MapIntToInt * Remove the map-int-to-int-file * Set Version: 0.1.64 * Set Version: 0.1.71 --------- Co-authored-by: devops <[email protected]> Co-authored-by: Jost Berthold <[email protected]>
1 parent 91f83ca commit b353017

File tree

10 files changed

+33
-496
lines changed

10 files changed

+33
-496
lines changed

media/201903-report-chalmers.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ This is the full definition of the `(memory.grow)` operation:
800800
#then SIZE
801801
#else -1
802802
#fi ... </k>
803-
<memAddrs> wrap(0) Int2Int|-> wrap(ADDR) </memAddrs>
803+
<memAddrs> 0 |-> ADDR </memAddrs>
804804
<memInst>
805805
<memAddr> ADDR </memAddr>
806806
<mmax> MAX </mmax>

media/memory-demo/memory-spec.k

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ module MEMORY-SPEC
22
imports WASM
33

44
rule <k> ( memory.size ) => (i32.const SZ) ... </k>
5-
<memAddrs> wrap(0) Int2Int|-> wrap(A) </memAddrs>
5+
<memAddrs> 0 |-> A </memAddrs>
66
<memInst>
77
<memAddr> A </memAddr>
88
<memSize> SZ </memSize>
99
</memInst>
1010

1111
rule <k> (memory.grow (i32.const X)) => (i32.const SZ) ...</k>
12-
<memAddrs> wrap(0) Int2Int|-> wrap(A) </memAddrs>
12+
<memAddrs> 0 |-> A </memAddrs>
1313
<memInst>
1414
<memAddr> A </memAddr>
1515
<memSize> SZ => (SZ +Int X) </memSize>
@@ -21,7 +21,7 @@ module MEMORY-SPEC
2121
andBool SZ >=Int 0
2222

2323
rule <k> (memory.grow (i32.const X)) => (i32.const -1) ...</k>
24-
<memAddrs> wrap(0) Int2Int|-> wrap(A) </memAddrs>
24+
<memAddrs> 0 |-> A </memAddrs>
2525
<memInst>
2626
<memAddr> A </memAddr>
2727
<memSize> SZ </memSize>

media/memory-demo/wasm.k

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ endmodule
104104
<spuriousMemoryFail> false </spuriousMemoryFail>
105105

106106
rule <k> (( memory ) ~> ELSE) => ELSE </k>
107-
<memAddrs> .MapIntToInt => wrap(0) Int2Int|-> wrap(NEXT) </memAddrs>
107+
<memAddrs> .Map => 0 |-> NEXT </memAddrs>
108108
<nextMemAddr> NEXT => NEXT +Int 1 </nextMemAddr>
109109
<mems>
110110
(.Bag =>
@@ -118,7 +118,7 @@ endmodule
118118
syntax Instr ::= "(" "memory.size" ")"
119119
// --------------------------------------
120120
rule <k> ( memory.size ) => ( i32.const SZ ) ... </k>
121-
<memAddrs> wrap(0) Int2Int|-> wrap(A) </memAddrs>
121+
<memAddrs> 0 |-> A </memAddrs>
122122
<memInst>
123123
<memAddr> A </memAddr>
124124
<memSize> SZ </memSize>
@@ -131,7 +131,7 @@ endmodule
131131
rule <k> (memory.grow I:Instr) => I ~> (memory.grow) ... </k>
132132
rule <k> (memory.grow) => (i32.const SZ) ... </k>
133133
<stack> < i32 > V : S => S </stack>
134-
<memAddrs> wrap(0) Int2Int|-> wrap(A) </memAddrs>
134+
<memAddrs> 0 |-> A </memAddrs>
135135
<memInst>
136136
<memAddr> A </memAddr>
137137
<memSize> SZ => SZ +Int V </memSize>

package/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.70
1+
0.1.71

pykwasm/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "pykwasm"
7-
version = "0.1.70"
7+
version = "0.1.71"
88
description = ""
99
authors = [
1010
"Runtime Verification, Inc. <[email protected]>",

0 commit comments

Comments
 (0)