@@ -334,14 +334,41 @@ impl<'store, const BUDGETED: bool> Executor<'store, BUDGETED> {
334334 SetLocalConst32 ( local_index, c) => i32:: local_set ( & mut self . store . value_stack , & self . cf , * local_index, * c) ,
335335 SetLocalConst64 ( local_index, c) => i64:: local_set ( & mut self . store . value_stack , & self . cf , * local_index, * c) ,
336336 SetLocalConst128 ( local_index, c) => Value128 :: local_set ( & mut self . store . value_stack , & self . cf , * local_index, Value128 ( self . func . data . v128_const ( * c) ) ) ,
337+ IncMemoryLocal32 ( m, addr_local) => self . exec_inc_memory_local :: < i32 , 4 > ( * m, * addr_local, |v| v. wrapping_add ( 1 ) ) ?,
338+ IncMemoryLocal64 ( m, addr_local) => self . exec_inc_memory_local :: < i64 , 8 > ( * m, * addr_local, |v| v. wrapping_add ( 1 ) ) ?,
337339 StoreLocalLocal32 ( m, addr_local, value_local) => self . exec_store_local_local :: < u32 , 4 > ( * m, * addr_local, * value_local) ?,
338340 StoreLocalLocal64 ( m, addr_local, value_local) => self . exec_store_local_local :: < i64 , 8 > ( * m, * addr_local, * value_local) ?,
339341 StoreLocalLocal128 ( m, addr_local, value_local) => self . exec_store_local_local :: < Value128 , 16 > ( * m, * addr_local, * value_local) ?,
340342 LoadLocal32 ( m, addr_local) => self . store . value_stack . push ( self . exec_load_local_value :: < i32 , 4 > ( * m, * addr_local) ?) ?,
341- LoadLocalTee32 ( m, addr_local, dst_local) => self . exec_load_local_tee :: < i32 , 4 > ( * m, * addr_local, * dst_local) ?,
342- LoadLocalSet32 ( m, addr_local, dst_local) => self . exec_load_local_set :: < i32 , 4 > ( * m, * addr_local, * dst_local) ?,
343- LoadLocalTee128 ( m, addr_local, dst_local) => self . exec_load_local_tee :: < Value128 , 16 > ( * m, * addr_local, * dst_local) ?,
344- LoadLocalSet128 ( m, addr_local, dst_local) => self . exec_load_local_set :: < Value128 , 16 > ( * m, * addr_local, * dst_local) ?,
343+ LoadLocal64 ( m, addr_local) => self . store . value_stack . push ( self . exec_load_local_value :: < i64 , 8 > ( * m, * addr_local) ?) ?,
344+ LoadLocal8S32 ( m, addr_local) => {
345+ let value = self . exec_load_local_value :: < i8 , 1 > ( * m, * addr_local) ?;
346+ self . store . value_stack . push ( i32:: from ( value) ) ?;
347+ }
348+ LoadLocal8U32 ( m, addr_local) => {
349+ let value = self . exec_load_local_value :: < u8 , 1 > ( * m, * addr_local) ?;
350+ self . store . value_stack . push ( i32:: from ( value) ) ?;
351+ }
352+ LoadLocal16S32 ( m, addr_local) => {
353+ let value = self . exec_load_local_value :: < i16 , 2 > ( * m, * addr_local) ?;
354+ self . store . value_stack . push ( i32:: from ( value) ) ?;
355+ }
356+ LoadLocal16U32 ( m, addr_local) => {
357+ let value = self . exec_load_local_value :: < u16 , 2 > ( * m, * addr_local) ?;
358+ self . store . value_stack . push ( i32:: from ( value) ) ?;
359+ }
360+ LoadLocalTee32 ( m, addr_local, dst_local) => self . exec_load_local_tee :: < i32 , 4 , _ > ( * m, * addr_local, * dst_local, |v| v) ?,
361+ LoadLocalSet32 ( m, addr_local, dst_local) => self . exec_load_local_set :: < i32 , 4 , _ > ( * m, * addr_local, * dst_local, |v| v) ?,
362+ LoadLocalTee8S32 ( m, addr_local, dst_local) => self . exec_load_local_tee :: < i8 , 1 , _ > ( * m, * addr_local, * dst_local, i32:: from) ?,
363+ LoadLocalTee8U32 ( m, addr_local, dst_local) => self . exec_load_local_tee :: < u8 , 1 , _ > ( * m, * addr_local, * dst_local, i32:: from) ?,
364+ LoadLocalTee16S32 ( m, addr_local, dst_local) => self . exec_load_local_tee :: < i16 , 2 , _ > ( * m, * addr_local, * dst_local, i32:: from) ?,
365+ LoadLocalTee16U32 ( m, addr_local, dst_local) => self . exec_load_local_tee :: < u16 , 2 , _ > ( * m, * addr_local, * dst_local, i32:: from) ?,
366+ LoadLocalSet8S32 ( m, addr_local, dst_local) => self . exec_load_local_set :: < i8 , 1 , _ > ( * m, * addr_local, * dst_local, i32:: from) ?,
367+ LoadLocalSet8U32 ( m, addr_local, dst_local) => self . exec_load_local_set :: < u8 , 1 , _ > ( * m, * addr_local, * dst_local, i32:: from) ?,
368+ LoadLocalSet16S32 ( m, addr_local, dst_local) => self . exec_load_local_set :: < i16 , 2 , _ > ( * m, * addr_local, * dst_local, i32:: from) ?,
369+ LoadLocalSet16U32 ( m, addr_local, dst_local) => self . exec_load_local_set :: < u16 , 2 , _ > ( * m, * addr_local, * dst_local, i32:: from) ?,
370+ LoadLocalTee128 ( m, addr_local, dst_local) => self . exec_load_local_tee :: < Value128 , 16 , _ > ( * m, * addr_local, * dst_local, |v| v) ?,
371+ LoadLocalSet128 ( m, addr_local, dst_local) => self . exec_load_local_set :: < Value128 , 16 , _ > ( * m, * addr_local, * dst_local, |v| v) ?,
345372 AndConstTee32 ( c, local_index) => { stack_op ! ( unary i32 , |v| v & * c) ; stack_op ! ( local_tee i32 , local_index) ; }
346373 SubConstTee32 ( c, local_index) => { stack_op ! ( unary i32 , |v| v. wrapping_sub( * c) ) ; stack_op ! ( local_tee i32 , local_index) ; }
347374 AndConstTee64 ( c, local_index) => { stack_op ! ( unary i64 , |v| v & * c) ; stack_op ! ( local_tee i64 , local_index) ; }
@@ -1150,6 +1177,28 @@ impl<'store, const BUDGETED: bool> Executor<'store, BUDGETED> {
11501177 Ok ( ( ) )
11511178 }
11521179
1180+ #[ inline( always) ]
1181+ fn exec_inc_memory_local < T : MemValue < N > , const N : usize > (
1182+ & mut self ,
1183+ memarg : MemoryArg ,
1184+ addr_local : u8 ,
1185+ increment : impl FnOnce ( T ) -> T ,
1186+ ) -> Result < ( ) , Trap > {
1187+ let mem_addr = self . module . resolve_mem_addr ( memarg. mem_addr ( ) ) ;
1188+ let mem = self . store . state . get_mem ( mem_addr) ;
1189+ let addr = if mem. is_64bit ( ) {
1190+ let base = i64:: local_get ( & self . store . value_stack , & self . cf , u16:: from ( addr_local) ) as u64 ;
1191+ mem. effective_addr_64 :: < N > ( base, memarg. offset ( ) ) ?
1192+ } else {
1193+ let base = u32:: local_get ( & self . store . value_stack , & self . cf , u16:: from ( addr_local) ) ;
1194+ mem. effective_addr_32 :: < N > ( base, memarg. offset ( ) ) ?
1195+ } ;
1196+
1197+ let mem = self . store . state . get_mem_mut ( mem_addr) ;
1198+ let value = T :: load_at ( & * mem. inner , addr) ?;
1199+ increment ( value) . store_at ( & mut * mem. inner , addr)
1200+ }
1201+
11531202 #[ inline( always) ]
11541203 fn exec_fma_store <
11551204 T : InternalValue + MemValue < N > + core:: ops:: Add < Output = T > + core:: ops:: Mul < Output = T > ,
@@ -1187,8 +1236,13 @@ impl<'store, const BUDGETED: bool> Executor<'store, BUDGETED> {
11871236 addr_local : u8 ,
11881237 ) -> Result < T , Trap > {
11891238 let mem = self . store . state . get_mem ( self . module . resolve_mem_addr ( memarg. mem_addr ( ) ) ) ;
1190- let base = u32:: local_get ( & self . store . value_stack , & self . cf , u16:: from ( addr_local) ) ;
1191- let addr = mem. effective_addr_32 :: < N > ( base, memarg. offset ( ) ) ?;
1239+ let addr = if mem. is_64bit ( ) {
1240+ let base = i64:: local_get ( & self . store . value_stack , & self . cf , u16:: from ( addr_local) ) as u64 ;
1241+ mem. effective_addr_64 :: < N > ( base, memarg. offset ( ) ) ?
1242+ } else {
1243+ let base = u32:: local_get ( & self . store . value_stack , & self . cf , u16:: from ( addr_local) ) ;
1244+ mem. effective_addr_32 :: < N > ( base, memarg. offset ( ) ) ?
1245+ } ;
11921246 match T :: load_at ( & * mem. inner , addr) {
11931247 Ok ( res) => Ok ( res) ,
11941248 Err ( err) => {
@@ -1198,26 +1252,28 @@ impl<'store, const BUDGETED: bool> Executor<'store, BUDGETED> {
11981252 }
11991253 }
12001254
1201- fn exec_load_local_tee < T : InternalValue + MemValue < N > , const N : usize > (
1255+ fn exec_load_local_tee < LOAD : MemValue < N > , const N : usize , TARGET : InternalValue > (
12021256 & mut self ,
12031257 memarg : MemoryArg ,
12041258 addr_local : u8 ,
12051259 dst_local : u8 ,
1260+ cast : impl Fn ( LOAD ) -> TARGET ,
12061261 ) -> Result < ( ) , Trap > {
1207- let value = self . exec_load_local_value :: < T , N > ( memarg, addr_local) ?;
1208- T :: local_set ( & mut self . store . value_stack , & self . cf , u16:: from ( dst_local) , value) ;
1262+ let value = cast ( self . exec_load_local_value :: < LOAD , N > ( memarg, addr_local) ?) ;
1263+ TARGET :: local_set ( & mut self . store . value_stack , & self . cf , u16:: from ( dst_local) , value) ;
12091264 self . store . value_stack . push ( value) ?;
12101265 Ok ( ( ) )
12111266 }
12121267
1213- fn exec_load_local_set < T : InternalValue + MemValue < N > , const N : usize > (
1268+ fn exec_load_local_set < LOAD : MemValue < N > , const N : usize , TARGET : InternalValue > (
12141269 & mut self ,
12151270 memarg : MemoryArg ,
12161271 addr_local : u8 ,
12171272 dst_local : u8 ,
1273+ cast : impl Fn ( LOAD ) -> TARGET ,
12181274 ) -> Result < ( ) , Trap > {
1219- let value = self . exec_load_local_value :: < T , N > ( memarg, addr_local) ?;
1220- T :: local_set ( & mut self . store . value_stack , & self . cf , u16:: from ( dst_local) , value) ;
1275+ let value = cast ( self . exec_load_local_value :: < LOAD , N > ( memarg, addr_local) ?) ;
1276+ TARGET :: local_set ( & mut self . store . value_stack , & self . cf , u16:: from ( dst_local) , value) ;
12211277 Ok ( ( ) )
12221278 }
12231279
0 commit comments