@@ -49,49 +49,41 @@ func (d decompress4x) generateProcedure(name string) {
4949 exhausted := GP64 ()
5050 XORQ (exhausted .As64 (), exhausted .As64 ()) // exhausted = false
5151
52- limitPtr := AllocLocal ( 8 )
52+ limit := GP64 ( )
5353
5454 bufferOrigin := GP64 ()
5555 peekBits := GP64 ()
5656 buffer := GP64 ()
5757 dstEvery := GP64 ()
5858 table := GP64 ()
5959
60- br0 := GP64 ()
61- br1 := GP64 ()
62- br2 := GP64 ()
63- br3 := GP64 ()
60+ br := GP64 ()
6461
6562 Comment ("Preload values" )
6663 {
6764 ctx := Dereference (Param ("ctx" ))
6865 Load (ctx .Field ("peekBits" ), peekBits )
69- Load (ctx .Field ("out" ), buffer )
70- MOVQ (buffer , bufferOrigin )
71- limit := Load (ctx .Field ("limit" ), GP64 ())
72- MOVQ (limit , limitPtr )
66+ Load (ctx .Field ("out" ), bufferOrigin )
67+ Load (ctx .Field ("limit" ), limit )
7368 Load (ctx .Field ("dstEvery" ), dstEvery )
7469 Load (ctx .Field ("tbl" ), table )
75- Load (ctx .Field ("pbr0" ), br0 )
76- Load (ctx .Field ("pbr1" ), br1 )
77- Load (ctx .Field ("pbr2" ), br2 )
78- Load (ctx .Field ("pbr3" ), br3 )
70+ Load (ctx .Field ("pbr" ), br )
7971 }
8072
8173 Comment ("Main loop" )
8274 Label ("main_loop" )
8375
8476 MOVQ (bufferOrigin , buffer )
8577 // Check if we have space
86- CMPQ (buffer , limitPtr )
78+ CMPQ (buffer , limit )
8779 SETGE (exhausted .As8 ())
88- d .decodeTwoValues (0 , br0 , peekBits , table , buffer , exhausted )
80+ d .decodeTwoValues (0 , br , peekBits , table , buffer , exhausted )
8981 ADDQ (dstEvery , buffer )
90- d .decodeTwoValues (1 , br1 , peekBits , table , buffer , exhausted )
82+ d .decodeTwoValues (1 , br , peekBits , table , buffer , exhausted )
9183 ADDQ (dstEvery , buffer )
92- d .decodeTwoValues (2 , br2 , peekBits , table , buffer , exhausted )
84+ d .decodeTwoValues (2 , br , peekBits , table , buffer , exhausted )
9385 ADDQ (dstEvery , buffer )
94- d .decodeTwoValues (3 , br3 , peekBits , table , buffer , exhausted )
86+ d .decodeTwoValues (3 , br , peekBits , table , buffer , exhausted )
9587
9688 ADDQ (U8 (2 ), bufferOrigin ) // off += 2
9789
@@ -100,10 +92,9 @@ func (d decompress4x) generateProcedure(name string) {
10092
10193 {
10294 ctx := Dereference (Param ("ctx" ))
103- tmp := Load (ctx .Field ("out" ), GP64 ())
104- decoded := GP64 ()
105- MOVQ (bufferOrigin , decoded )
106- SUBQ (tmp , decoded )
95+ ctxout , _ := ctx .Field ("out" ).Resolve ()
96+ decoded := bufferOrigin
97+ SUBQ (ctxout .Addr , decoded )
10798 SHLQ (U8 (2 ), decoded ) // decoded *= 4
10899
109100 Store (decoded , ctx .Field ("decoded" ))
@@ -118,6 +109,7 @@ const bitReader_in = 0
118109const bitReader_off = bitReader_in + 3 * 8 // {ptr, len, cap}
119110const bitReader_value = bitReader_off + 8
120111const bitReader_bitsRead = bitReader_value + 8
112+ const bitReader__size = bitReader_bitsRead + 8
121113
122114func (d decompress4x ) decodeTwoValues (id int , br , peekBits , table , buffer , exhausted reg.GPVirtual ) {
123115 brValue , brBitsRead := d .fillFast32 (id , 32 , br , exhausted )
@@ -157,9 +149,10 @@ func (d decompress4x) decodeTwoValues(id int, br, peekBits, table, buffer, exhau
157149 Comment ("out[id * dstEvery + 1] = uint8(v1.entry >> 8)" )
158150 MOVW (out .As16 (), Mem {Base : buffer })
159151
160- Comment ("update the bitrader reader structure" )
161- MOVQ (brValue , Mem {Base : br , Disp : bitReader_value })
162- MOVB (brBitsRead .As8 (), Mem {Base : br , Disp : bitReader_bitsRead })
152+ Comment ("update the bitreader structure" )
153+ offset := id * bitReader__size
154+ MOVQ (brValue , Mem {Base : br , Disp : offset + bitReader_value })
155+ MOVB (brBitsRead .As8 (), Mem {Base : br , Disp : offset + bitReader_bitsRead })
163156}
164157
165158func (d decompress4x ) generateProcedure4x8bit (name string ) {
@@ -171,49 +164,41 @@ func (d decompress4x) generateProcedure4x8bit(name string) {
171164 exhausted := GP64 () // Fixed since we need 8H
172165 XORQ (exhausted .As64 (), exhausted .As64 ()) // exhausted = false
173166
174- bufferOrigin := AllocLocal ( 8 )
175- limitPtr := AllocLocal ( 8 )
167+ bufferOrigin := GP64 ( )
168+ limit := GP64 ( )
176169
177170 peekBits := GP64 ()
178171 buffer := GP64 ()
179172 dstEvery := GP64 ()
180173 table := GP64 ()
181174
182- br0 := GP64 ()
183- br1 := GP64 ()
184- br2 := GP64 ()
185- br3 := GP64 ()
175+ br := GP64 ()
186176
187177 Comment ("Preload values" )
188178 {
189179 ctx := Dereference (Param ("ctx" ))
190180 Load (ctx .Field ("peekBits" ), peekBits )
191- Load (ctx .Field ("out" ), buffer )
192- MOVQ (buffer , bufferOrigin )
193- limit := Load (ctx .Field ("limit" ), GP64 ())
194- MOVQ (limit , limitPtr )
181+ Load (ctx .Field ("out" ), bufferOrigin )
182+ Load (ctx .Field ("limit" ), limit )
195183 Load (ctx .Field ("dstEvery" ), dstEvery )
196184 Load (ctx .Field ("tbl" ), table )
197- Load (ctx .Field ("pbr0" ), br0 )
198- Load (ctx .Field ("pbr1" ), br1 )
199- Load (ctx .Field ("pbr2" ), br2 )
200- Load (ctx .Field ("pbr3" ), br3 )
185+ Load (ctx .Field ("pbr" ), br )
201186 }
202187
203188 Comment ("Main loop" )
204189 Label ("main_loop" )
205190
206191 MOVQ (bufferOrigin , buffer )
207192 // Check if we have space
208- CMPQ (buffer , limitPtr )
193+ CMPQ (buffer , limit )
209194 SETGE (exhausted .As8 ())
210- d .decodeFourValues (0 , br0 , peekBits , table , buffer , exhausted )
195+ d .decodeFourValues (0 , br , peekBits , table , buffer , exhausted )
211196 ADDQ (dstEvery , buffer )
212- d .decodeFourValues (1 , br1 , peekBits , table , buffer , exhausted )
197+ d .decodeFourValues (1 , br , peekBits , table , buffer , exhausted )
213198 ADDQ (dstEvery , buffer )
214- d .decodeFourValues (2 , br2 , peekBits , table , buffer , exhausted )
199+ d .decodeFourValues (2 , br , peekBits , table , buffer , exhausted )
215200 ADDQ (dstEvery , buffer )
216- d .decodeFourValues (3 , br3 , peekBits , table , buffer , exhausted )
201+ d .decodeFourValues (3 , br , peekBits , table , buffer , exhausted )
217202
218203 ADDQ (U8 (4 ), bufferOrigin ) // off += 4
219204
@@ -222,10 +207,9 @@ func (d decompress4x) generateProcedure4x8bit(name string) {
222207
223208 {
224209 ctx := Dereference (Param ("ctx" ))
225- tmp := Load (ctx .Field ("out" ), GP64 ())
226- decoded := GP64 ()
227- MOVQ (bufferOrigin , decoded )
228- SUBQ (tmp , decoded )
210+ ctxout , _ := ctx .Field ("out" ).Resolve ()
211+ decoded := bufferOrigin
212+ SUBQ (ctxout .Addr , decoded )
229213 SHLQ (U8 (2 ), decoded ) // decoded *= 4
230214
231215 Store (decoded , ctx .Field ("decoded" ))
@@ -234,7 +218,7 @@ func (d decompress4x) generateProcedure4x8bit(name string) {
234218}
235219
236220func (d decompress4x ) decodeFourValues (id int , br , peekBits , table , buffer , exhausted reg.GPVirtual ) {
237- brValue , brBitsRead := d .fillFast32 (id + 1000 , 32 , br , exhausted )
221+ brValue , brBitsRead := d .fillFast32 (id , 32 , br , exhausted )
238222
239223 decompress := func (valID int , outByte reg.Register ) {
240224 CX := reg .CL
@@ -269,9 +253,10 @@ func (d decompress4x) decodeFourValues(id int, br, peekBits, table, buffer, exha
269253 Comment ("out[id * dstEvery + 4] = uint8(v3.entry >> 8)" )
270254 MOVL (out .As32 (), Mem {Base : buffer })
271255
272- Comment ("update the bitreader reader structure" )
273- MOVQ (brValue , Mem {Base : br , Disp : bitReader_value })
274- MOVB (brBitsRead .As8 (), Mem {Base : br , Disp : bitReader_bitsRead })
256+ Comment ("update the bitreader structure" )
257+ offset := id * bitReader__size
258+ MOVQ (brValue , Mem {Base : br , Disp : offset + bitReader_value })
259+ MOVB (brBitsRead .As8 (), Mem {Base : br , Disp : offset + bitReader_bitsRead })
275260}
276261
277262func (d decompress4x ) fillFast32 (id , atLeast int , br , exhausted reg.GPVirtual ) (brValue , brBitsRead reg.GPVirtual ) {
@@ -281,14 +266,15 @@ func (d decompress4x) fillFast32(id, atLeast int, br, exhausted reg.GPVirtual) (
281266 Commentf ("br%d.fillFast32()" , id )
282267 brValue = GP64 ()
283268 brBitsRead = GP64 ()
284- MOVQ (Mem {Base : br , Disp : bitReader_value }, brValue )
285- MOVBQZX (Mem {Base : br , Disp : bitReader_bitsRead }, brBitsRead )
269+ offset := bitReader__size * id
270+ MOVQ (Mem {Base : br , Disp : offset + bitReader_value }, brValue )
271+ MOVBQZX (Mem {Base : br , Disp : offset + bitReader_bitsRead }, brBitsRead )
286272
287273 // We must have at least 2 * max tablelog left
288274 CMPQ (brBitsRead , U8 (64 - atLeast ))
289275 JBE (LabelRef ("skip_fill" + strconv .Itoa (id )))
290276 brOffset := GP64 ()
291- MOVQ (Mem {Base : br , Disp : bitReader_off }, brOffset )
277+ MOVQ (Mem {Base : br , Disp : offset + bitReader_off }, brOffset )
292278
293279 SUBQ (U8 (32 ), brBitsRead ) // b.bitsRead -= 32
294280 SUBQ (U8 (4 ), brOffset ) // b.off -= 4
@@ -297,7 +283,7 @@ func (d decompress4x) fillFast32(id, atLeast int, br, exhausted reg.GPVirtual) (
297283 // v = v[:4]
298284 // low := (uint32(v[0])) | (uint32(v[1]) << 8) | (uint32(v[2]) << 16) | (uint32(v[3]) << 24)
299285 tmp := GP64 ()
300- MOVQ (Mem {Base : br , Disp : bitReader_in }, tmp )
286+ MOVQ (Mem {Base : br , Disp : offset + bitReader_in }, tmp )
301287
302288 Comment ("b.value |= uint64(low) << (b.bitsRead & 63)" )
303289 addr := Mem {Base : brOffset , Index : tmp .As64 (), Scale : 1 }
@@ -306,7 +292,7 @@ func (d decompress4x) fillFast32(id, atLeast int, br, exhausted reg.GPVirtual) (
306292 MOVQ (brBitsRead , CX .As64 ())
307293 SHLQ (CX , tmp .As64 ())
308294
309- MOVQ (brOffset , Mem {Base : br , Disp : bitReader_off })
295+ MOVQ (brOffset , Mem {Base : br , Disp : offset + bitReader_off })
310296 ORQ (tmp .As64 (), brValue )
311297 {
312298 Commentf ("exhausted = exhausted || (br%d.off < 4)" , id )
@@ -474,11 +460,9 @@ func (d decompress1x) generateProcedure(name string) {
474460 {
475461 // calculate decoded as current `out` - initial `out`
476462 ctx := Dereference (Param ("ctx" ))
477- decoded := GP64 ()
478- tmp := GP64 ()
479- MOVQ (buffer , decoded )
480- Load (ctx .Field ("out" ), tmp )
481- SUBQ (tmp , decoded )
463+ ctxout , _ := ctx .Field ("out" ).Resolve ()
464+ decoded := buffer
465+ SUBQ (ctxout .Addr , decoded )
482466 Store (decoded , ctx .Field ("decoded" ))
483467
484468 pbr := Dereference (ctx .Field ("pbr" ))
0 commit comments