Shunt instructions to managed data (GC) prefix

wingo · wingo · commit 87d3d480c161 · 2022-05-11T17:01:45.000+02:00
Also update section number to not overlap with the tag section, and fix
reftypes to not overlap with dataref/arrayref shorthands.
diff --git a/proposals/stringref/Overview.md b/proposals/stringref/Overview.md
@@ -483,49 +483,49 @@ Return a substring of *`view`*, starting at the current position of
 
 ```
 reftype ::= ...
-         |  0x67 ⇒ stringref         ; SLEB128(-0x19)
-         |  0x66 ⇒ stringview_wtf8   ; SLEB128(-0x1a)
-         |  0x65 ⇒ stringview_wtf16  ; SLEB128(-0x1b)
-         |  0x64 ⇒ stringview_iter   ; SLEB128(-0x1c)
+         |  0x65 ⇒ stringref         ; SLEB128(-0x1b)
+         |  0x64 ⇒ stringview_wtf8   ; SLEB128(-0x1c)
+         |  0x63 ⇒ stringview_wtf16  ; SLEB128(-0x1d)
+         |  0x62 ⇒ stringview_iter   ; SLEB128(-0x1e)
 
 wtf8_policy ::= 0x00 ⇒ utf8
              |  0x01 ⇒ wtf8
              |  0x02 ⇒ replace
 
 instr ::= ...
-       |  0xfc 0x12 $mem:u32              ⇒ string.new_wtf8 $mem
-       |  0xfc 0x13 $mem:u32              ⇒ string.new_wtf16 $mem
-       |  0xfc 0x14 $idx:u32              ⇒ string.const $idx
-       |  0xfc 0x15                       ⇒ string.measure_utf8
-       |  0xfc 0x16                       ⇒ string.measure_wtf8
-       |  0xfc 0x17                       ⇒ string.measure_wtf16
-       |  0xfc 0x18 $mem:u32 $policy:u32  ⇒ string.encode_wtf8 $mem $policy
-       |  0xfc 0x19 $mem:u32              ⇒ string.encode_wtf16 $mem
-       |  0xfc 0x1a                       ⇒ string.concat
-       |  0xfc 0x1b                       ⇒ string.eq
-       |  0xfc 0x1c                       ⇒ string.is_usv_sequence
-       |  0xfc 0x1d                       ⇒ string.as_wtf8
-       |  0xfc 0x1e                       ⇒ string.as_wtf16
-       |  0xfc 0x1f                       ⇒ string.as_iter
-       |  0xfc 0x20                       ⇒ stringview_wtf8.advance
-       |  0xfc 0x21 $mem:u32 $policy:u32  ⇒ stringview_wtf8.encode $mem $policy
-       |  0xfc 0x22                       ⇒ stringview_wtf8.slice
-       |  0xfc 0x23                       ⇒ stringview_wtf16.length
-       |  0xfc 0x24                       ⇒ stringview_wtf16.get_codeunit
-       |  0xfc 0x25 $mem:u32              ⇒ stringview_wtf16.encode $mem
-       |  0xfc 0x26                       ⇒ stringview_wtf16.slice
-       |  0xfc 0x27                       ⇒ stringview_iter.cur
-       |  0xfc 0x28                       ⇒ stringview_iter.advance
-       |  0xfc 0x29                       ⇒ stringview_iter.rewind
-       |  0xfc 0x2a                       ⇒ stringview_iter.slice
+       |  0xfb 0x80 $mem:u32              ⇒ string.new_wtf8 $mem
+       |  0xfb 0x81 $mem:u32              ⇒ string.new_wtf16 $mem
+       |  0xfb 0x82 $idx:u32              ⇒ string.const $idx
+       |  0xfb 0x83                       ⇒ string.measure_utf8
+       |  0xfb 0x84                       ⇒ string.measure_wtf8
+       |  0xfb 0x85                       ⇒ string.measure_wtf16
+       |  0xfb 0x86 $mem:u32 $policy:u32  ⇒ string.encode_wtf8 $mem $policy
+       |  0xfb 0x87 $mem:u32              ⇒ string.encode_wtf16 $mem
+       |  0xfb 0x88                       ⇒ string.concat
+       |  0xfb 0x89                       ⇒ string.eq
+       |  0xfb 0x8a                       ⇒ string.is_usv_sequence
+       |  0xfb 0x90                       ⇒ string.as_wtf8
+       |  0xfb 0x91                       ⇒ stringview_wtf8.advance
+       |  0xfb 0x92 $mem:u32 $policy:u32  ⇒ stringview_wtf8.encode $mem $policy
+       |  0xfb 0x93                       ⇒ stringview_wtf8.slice
+       |  0xfb 0x98                       ⇒ string.as_wtf16
+       |  0xfb 0x99                       ⇒ stringview_wtf16.length
+       |  0xfb 0x9a                       ⇒ stringview_wtf16.get_codeunit
+       |  0xfb 0x9b $mem:u32              ⇒ stringview_wtf16.encode $mem
+       |  0xfb 0x9c                       ⇒ stringview_wtf16.slice
+       |  0xfb 0xa0                       ⇒ string.as_iter
+       |  0xfb 0xa1                       ⇒ stringview_iter.cur
+       |  0xfb 0xa2                       ⇒ stringview_iter.advance
+       |  0xfb 0xa3                       ⇒ stringview_iter.rewind
+       |  0xfb 0xa4                       ⇒ stringview_iter.slice
 
 ;; New section.  Could be a data segment instead, but really we would
 ;; like for it to come before the code so that we can avoid dynamic
 ;; checks in string.const, and before the elem and global sections so
 ;; that we can have constant strings.  If present, must be present only
 ;; once, and right before the globals section (or where the globals
 ;; section would be).
-stringrefs ::= section_13(vec(vec(u8)))
+stringrefs ::= section_14(vec(vec(u8)))
 ```
 
 ## Examples
