From b2ba936deb37f4879f1412aca4ecfa355d3b84c5 Mon Sep 17 00:00:00 2001 From: "Ben L. Titzer" Date: Wed, 26 Feb 2025 18:37:04 -0500 Subject: [PATCH] Fix return type of Pointer.atUnboxedField tests (#361) --- test/pointer/Pointer_atUnboxedField03.v3 | 3 +-- test/pointer/Pointer_atUnboxedField04.v3 | 4 +--- test/pointer/Pointer_atUnboxedField05.v3 | 4 +--- test/pointer/Pointer_atUnboxedField06.v3 | 4 +--- test/pointer/Pointer_atUnboxedField07.v3 | 4 +--- test/pointer/Pointer_atUnboxedField08.v3 | 4 +--- test/pointer/Pointer_atUnboxedField09.v3 | 8 +++----- test/pointer/Pointer_atUnboxedField10.v3 | 8 +++----- test/pointer/Pointer_atUnboxedField11.v3 | 7 ++----- test/pointer/Pointer_atUnboxedField12.v3 | 6 ++---- test/pointer/Pointer_atUnboxedField13.v3 | 7 ++----- test/pointer/Pointer_atUnboxedField14.v3 | 14 ++++---------- test/pointer/Pointer_atUnboxedField15.v3 | 12 ++++-------- test/pointer/Pointer_atUnboxedField16.v3 | 12 ++++-------- test/pointer/Pointer_atUnboxedField17.v3 | 11 +++-------- test/pointer/Pointer_atUnboxedField18.v3 | 14 ++++---------- test/pointer/Pointer_atUnboxedField19.v3 | 13 ++++--------- test/pointer/Pointer_atUnboxedField20.v3 | 13 ++++--------- test/pointer/Pointer_atUnboxedField21.v3 | 13 ++++--------- test/pointer/Pointer_atUnboxedField22.v3 | 10 +++------- test/pointer/Pointer_atUnboxedField23.v3 | 16 +++++----------- 21 files changed, 57 insertions(+), 130 deletions(-) diff --git a/test/pointer/Pointer_atUnboxedField03.v3 b/test/pointer/Pointer_atUnboxedField03.v3 index 43b9ca098..06eb521cb 100644 --- a/test/pointer/Pointer_atUnboxedField03.v3 +++ b/test/pointer/Pointer_atUnboxedField03.v3 @@ -17,8 +17,7 @@ component Comp { var compclsv = C.new(13, 14, 15); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var lclsv = C.new(17, 18, 19); // check values before doing anything, using regular accesses diff --git a/test/pointer/Pointer_atUnboxedField04.v3 b/test/pointer/Pointer_atUnboxedField04.v3 index f4910b4e2..242d8685b 100644 --- a/test/pointer/Pointer_atUnboxedField04.v3 +++ b/test/pointer/Pointer_atUnboxedField04.v3 @@ -5,12 +5,10 @@ type V(v8: u8, v16: u16, v32: u32, v64: u64) #unboxed { } var gv = V(1, 2, 3, 4); -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // check values before doing anything, using regular accesses - diff += (u32.view(gv.v8 ) ^ 1) + (u32.view(gv.v16) ^ 2) + diff --git a/test/pointer/Pointer_atUnboxedField05.v3 b/test/pointer/Pointer_atUnboxedField05.v3 index 4a1f9d3b0..f983a4708 100644 --- a/test/pointer/Pointer_atUnboxedField05.v3 +++ b/test/pointer/Pointer_atUnboxedField05.v3 @@ -7,12 +7,10 @@ component Comp { var compv = V(1, 2, 3, 4); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // check values before doing anything, using regular accesses - diff += (u32.view(Comp.compv.v8 ) ^ 1) + (u32.view(Comp.compv.v16) ^ 2) + diff --git a/test/pointer/Pointer_atUnboxedField06.v3 b/test/pointer/Pointer_atUnboxedField06.v3 index f7ae147f0..6642f9ae3 100644 --- a/test/pointer/Pointer_atUnboxedField06.v3 +++ b/test/pointer/Pointer_atUnboxedField06.v3 @@ -12,12 +12,10 @@ class C { var gclsv = C.new(1, 2, 3, 4); -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // check values before doing anything, using regular accesses - diff += (u32.view(gclsv.clsv.v8 ) ^ 1) + (u32.view(gclsv.clsv.v16) ^ 2) + diff --git a/test/pointer/Pointer_atUnboxedField07.v3 b/test/pointer/Pointer_atUnboxedField07.v3 index 29a83544a..da95b5add 100644 --- a/test/pointer/Pointer_atUnboxedField07.v3 +++ b/test/pointer/Pointer_atUnboxedField07.v3 @@ -14,12 +14,10 @@ component Comp { var compclsv = C.new(1, 2, 3, 4); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // check values before doing anything, using regular accesses - diff += (u32.view(Comp.compclsv.clsv.v8 ) ^ 1) + (u32.view(Comp.compclsv.clsv.v16) ^ 2) + diff --git a/test/pointer/Pointer_atUnboxedField08.v3 b/test/pointer/Pointer_atUnboxedField08.v3 index ef269675c..685d13c56 100644 --- a/test/pointer/Pointer_atUnboxedField08.v3 +++ b/test/pointer/Pointer_atUnboxedField08.v3 @@ -10,14 +10,12 @@ class C { } } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; var lclsv = C.new(1, 2, 3, 4); // check values before doing anything, using regular accesses - diff += (u32.view(lclsv.clsv.v8 ) ^ 1) + (u32.view(lclsv.clsv.v16) ^ 2) + diff --git a/test/pointer/Pointer_atUnboxedField09.v3 b/test/pointer/Pointer_atUnboxedField09.v3 index 8909ce1c4..48c3415dc 100644 --- a/test/pointer/Pointer_atUnboxedField09.v3 +++ b/test/pointer/Pointer_atUnboxedField09.v3 @@ -5,18 +5,16 @@ type V(v8: u8, v16: u16, v32: u32, v64: u64) #unboxed { } var gv = V(1, 2, 3, 4); -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // check values before doing anything, using pointer loads - diff += (u32.view(Pointer.atField(gv.v8 ).load< u8>()) ^ 1) + (u32.view(Pointer.atField(gv.v16).load()) ^ 2) + (u32.view(Pointer.atField(gv.v32).load()) ^ 3); - if (Pointer.SIZE == 8) - diff += (u32.view(Pointer.atField(gv.v64).load()) ^ 4); + + if (Pointer.SIZE == 8) diff += (u32.view(Pointer.atField(gv.v64).load()) ^ 4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField10.v3 b/test/pointer/Pointer_atUnboxedField10.v3 index d16bd6c69..de9eebfff 100644 --- a/test/pointer/Pointer_atUnboxedField10.v3 +++ b/test/pointer/Pointer_atUnboxedField10.v3 @@ -7,18 +7,16 @@ component Comp { var compv = V(1, 2, 3, 4); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // check values before doing anything, using pointer loads - diff += (u32.view(Pointer.atField(Comp.compv.v8 ).load< u8>()) ^ 1) + (u32.view(Pointer.atField(Comp.compv.v16).load()) ^ 2) + (u32.view(Pointer.atField(Comp.compv.v32).load()) ^ 3); - if (Pointer.SIZE == 8) - diff += (u32.view(Pointer.atField(Comp.compv.v64).load()) ^ 4); + + if (Pointer.SIZE == 8) diff += (u32.view(Pointer.atField(Comp.compv.v64).load()) ^ 4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField11.v3 b/test/pointer/Pointer_atUnboxedField11.v3 index 8008b8528..0dff15a00 100644 --- a/test/pointer/Pointer_atUnboxedField11.v3 +++ b/test/pointer/Pointer_atUnboxedField11.v3 @@ -12,18 +12,15 @@ class C { var gclsv = C.new(1, 2, 3, 4); -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // check values before doing anything, using pointer loads - diff += (u32.view(Pointer.atField(gclsv.clsv.v8 ).load< u8>()) ^ 1) + (u32.view(Pointer.atField(gclsv.clsv.v16).load()) ^ 2) + (u32.view(Pointer.atField(gclsv.clsv.v32).load()) ^ 3); - if (Pointer.SIZE == 8) - diff += (u32.view(Pointer.atField(gclsv.clsv.v64).load()) ^ 4); + if (Pointer.SIZE == 8) diff += (u32.view(Pointer.atField(gclsv.clsv.v64).load()) ^ 4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField12.v3 b/test/pointer/Pointer_atUnboxedField12.v3 index 858e66d12..f688f1096 100644 --- a/test/pointer/Pointer_atUnboxedField12.v3 +++ b/test/pointer/Pointer_atUnboxedField12.v3 @@ -14,8 +14,7 @@ component Comp { var compclsv = C.new(1, 2, 3, 4); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // check values before doing anything, using pointer loads @@ -24,8 +23,7 @@ def main(arg: int) -> u64 { (u32.view(Pointer.atField(Comp.compclsv.clsv.v8 ).load< u8>()) ^ 1) + (u32.view(Pointer.atField(Comp.compclsv.clsv.v16).load()) ^ 2) + (u32.view(Pointer.atField(Comp.compclsv.clsv.v32).load()) ^ 3); - if (Pointer.SIZE == 8) - diff += (u32.view(Pointer.atField(Comp.compclsv.clsv.v64).load()) ^ 4); + if (Pointer.SIZE == 8) diff += (u32.view(Pointer.atField(Comp.compclsv.clsv.v64).load()) ^ 4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField13.v3 b/test/pointer/Pointer_atUnboxedField13.v3 index dd8dc5ee4..179acbbfb 100644 --- a/test/pointer/Pointer_atUnboxedField13.v3 +++ b/test/pointer/Pointer_atUnboxedField13.v3 @@ -10,20 +10,17 @@ class C { } } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; var lclsv = C.new(1, 2, 3, 4); // check values before doing anything, using pointer loads - diff += (u32.view(Pointer.atField(lclsv.clsv.v8 ).load< u8>()) ^ 1) + (u32.view(Pointer.atField(lclsv.clsv.v16).load()) ^ 2) + (u32.view(Pointer.atField(lclsv.clsv.v32).load()) ^ 3); - if (Pointer.SIZE == 8) - diff += (u32.view(Pointer.atField(lclsv.clsv.v64).load()) ^ 4); + if (Pointer.SIZE == 8) diff += (u32.view(Pointer.atField(lclsv.clsv.v64).load()) ^ 4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField14.v3 b/test/pointer/Pointer_atUnboxedField14.v3 index a999dacb6..9b5898bf3 100644 --- a/test/pointer/Pointer_atUnboxedField14.v3 +++ b/test/pointer/Pointer_atUnboxedField14.v3 @@ -5,36 +5,30 @@ type V(v8: u8, v16: u16, v32: u32, v64: u64) #unboxed { } var gv = V(1, 2, 3, 4); -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // change values with cmpswp - Pointer.atField(gv.v8 ).cmpswp< u8>(1, u8 .!(101 + arg)); Pointer.atField(gv.v16).cmpswp(2, u16.!(102 + arg)); Pointer.atField(gv.v32).cmpswp(3, u32.!(103 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(gv.v64).cmpswp(4, u64.!(104 + arg)); + if (Pointer.SIZE == 8) Pointer.atField(gv.v64).cmpswp(4, u64.!(104 + arg)); // check values after cmpswp, using regular accesses - diff += (u32.view(gv.v8 ) ^ u32.!(101 + arg)) + (u32.view(gv.v16) ^ u32.!(102 + arg)) + (u32.view(gv.v32) ^ u32.!(103 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(gv.v64) ^ u32.!(104 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(gv.v64) ^ u32.!(104 + arg)); // reset values for succeeding runs Pointer.atField(gv.v8 ).store< u8>(1); Pointer.atField(gv.v16).store(2); Pointer.atField(gv.v32).store(3); - if (Pointer.SIZE == 8) - Pointer.atField(gv.v64).store(4); + if (Pointer.SIZE == 8) Pointer.atField(gv.v64).store(4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField15.v3 b/test/pointer/Pointer_atUnboxedField15.v3 index d1aaf0db0..7f2c37d9c 100644 --- a/test/pointer/Pointer_atUnboxedField15.v3 +++ b/test/pointer/Pointer_atUnboxedField15.v3 @@ -7,8 +7,7 @@ component Comp { var compv = V(1, 2, 3, 4); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // change values with cmpswp @@ -17,8 +16,7 @@ def main(arg: int) -> u64 { Pointer.atField(Comp.compv.v16).cmpswp(2, u16.!(102 + arg)); Pointer.atField(Comp.compv.v32).cmpswp(3, u32.!(103 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(Comp.compv.v64).cmpswp(4, u64.!(104 + arg)); + if (Pointer.SIZE == 8) Pointer.atField(Comp.compv.v64).cmpswp(4, u64.!(104 + arg)); // check values after cmpswp, using regular accesses @@ -27,16 +25,14 @@ def main(arg: int) -> u64 { (u32.view(Comp.compv.v16) ^ u32.!(102 + arg)) + (u32.view(Comp.compv.v32) ^ u32.!(103 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(Comp.compv.v64) ^ u32.!(104 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(Comp.compv.v64) ^ u32.!(104 + arg)); // reset values for succeeding runs Pointer.atField(Comp.compv.v8 ).store< u8>(1); Pointer.atField(Comp.compv.v16).store(2); Pointer.atField(Comp.compv.v32).store(3); - if (Pointer.SIZE == 8) - Pointer.atField(Comp.compv.v64).store(4); + if (Pointer.SIZE == 8) Pointer.atField(Comp.compv.v64).store(4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField16.v3 b/test/pointer/Pointer_atUnboxedField16.v3 index ec91c3bde..3d25a7f24 100644 --- a/test/pointer/Pointer_atUnboxedField16.v3 +++ b/test/pointer/Pointer_atUnboxedField16.v3 @@ -12,8 +12,7 @@ class C { var gclsv = C.new(1, 2, 3, 4); -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // change values with cmpswp @@ -22,8 +21,7 @@ def main(arg: int) -> u64 { Pointer.atField(gclsv.clsv.v16).cmpswp(2, u16.!(102 + arg)); Pointer.atField(gclsv.clsv.v32).cmpswp(3, u32.!(103 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(gclsv.clsv.v64).cmpswp(4, u64.!(104 + arg)); + if (Pointer.SIZE == 8) Pointer.atField(gclsv.clsv.v64).cmpswp(4, u64.!(104 + arg)); // check values after cmpswp, using regular accesses @@ -32,16 +30,14 @@ def main(arg: int) -> u64 { (u32.view(gclsv.clsv.v16) ^ u32.!(102 + arg)) + (u32.view(gclsv.clsv.v32) ^ u32.!(103 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(gclsv.clsv.v64) ^ u32.!(104 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(gclsv.clsv.v64) ^ u32.!(104 + arg)); // reset values for succeeding runs Pointer.atField(gclsv.clsv.v8 ).store< u8>(1); Pointer.atField(gclsv.clsv.v16).store(2); Pointer.atField(gclsv.clsv.v32).store(3); - if (Pointer.SIZE == 8) - Pointer.atField(gclsv.clsv.v64).store(4); + if (Pointer.SIZE == 8) Pointer.atField(gclsv.clsv.v64).store(4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField17.v3 b/test/pointer/Pointer_atUnboxedField17.v3 index 94710b1bf..026525284 100644 --- a/test/pointer/Pointer_atUnboxedField17.v3 +++ b/test/pointer/Pointer_atUnboxedField17.v3 @@ -14,12 +14,10 @@ component Comp { var compclsv = C.new(1, 2, 3, 4); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // change values with cmpswp - Pointer.atField(Comp.compclsv.clsv.v8 ).cmpswp< u8>(1, u8 .!(101 + arg)); Pointer.atField(Comp.compclsv.clsv.v16).cmpswp(2, u16.!(102 + arg)); Pointer.atField(Comp.compclsv.clsv.v32).cmpswp(3, u32.!(103 + arg)); @@ -28,22 +26,19 @@ def main(arg: int) -> u64 { Pointer.atField(Comp.compclsv.clsv.v64).cmpswp(4, u64.!(104 + arg)); // check values after cmpswp, using regular accesses - diff += (u32.view(Comp.compclsv.clsv.v8 ) ^ u32.!(101 + arg)) + (u32.view(Comp.compclsv.clsv.v16) ^ u32.!(102 + arg)) + (u32.view(Comp.compclsv.clsv.v32) ^ u32.!(103 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(Comp.compclsv.clsv.v64) ^ u32.!(104 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(Comp.compclsv.clsv.v64) ^ u32.!(104 + arg)); // reset values for succeeding runs Pointer.atField(Comp.compclsv.clsv.v8 ).store< u8>(1); Pointer.atField(Comp.compclsv.clsv.v16).store(2); Pointer.atField(Comp.compclsv.clsv.v32).store(3); - if (Pointer.SIZE == 8) - Pointer.atField(Comp.compclsv.clsv.v64).store(4); + if (Pointer.SIZE == 8) Pointer.atField(Comp.compclsv.clsv.v64).store(4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField18.v3 b/test/pointer/Pointer_atUnboxedField18.v3 index 0f1237fdb..a55a22ea1 100644 --- a/test/pointer/Pointer_atUnboxedField18.v3 +++ b/test/pointer/Pointer_atUnboxedField18.v3 @@ -10,38 +10,32 @@ class C { } } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; var lclsv = C.new(1, 2, 3, 4); // change values with cmpswp - Pointer.atField(lclsv.clsv.v8 ).cmpswp< u8>(1, u8 .!(101 + arg)); Pointer.atField(lclsv.clsv.v16).cmpswp(2, u16.!(102 + arg)); Pointer.atField(lclsv.clsv.v32).cmpswp(3, u32.!(103 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(lclsv.clsv.v64).cmpswp(4, u64.!(104 + arg)); + if (Pointer.SIZE == 8) Pointer.atField(lclsv.clsv.v64).cmpswp(4, u64.!(104 + arg)); // check values after cmpswp, using regular accesses - diff += (u32.view(lclsv.clsv.v8 ) ^ u32.!(101 + arg)) + (u32.view(lclsv.clsv.v16) ^ u32.!(102 + arg)) + (u32.view(lclsv.clsv.v32) ^ u32.!(103 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(lclsv.clsv.v64) ^ u32.!(104 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(lclsv.clsv.v64) ^ u32.!(104 + arg)); // reset values for succeeding runs Pointer.atField(lclsv.clsv.v8 ).store< u8>(1); Pointer.atField(lclsv.clsv.v16).store(2); Pointer.atField(lclsv.clsv.v32).store(3); - if (Pointer.SIZE == 8) - Pointer.atField(lclsv.clsv.v64).store(4); + if (Pointer.SIZE == 8) Pointer.atField(lclsv.clsv.v64).store(4); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField19.v3 b/test/pointer/Pointer_atUnboxedField19.v3 index c24b57542..e03067448 100644 --- a/test/pointer/Pointer_atUnboxedField19.v3 +++ b/test/pointer/Pointer_atUnboxedField19.v3 @@ -5,27 +5,22 @@ type V(v8: u8, v16: u16, v32: u32, v64: u64) #unboxed { } var gv = V(1, 2, 3, 4); -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // store new values, using pointer stores - Pointer.atField(gv.v8 ).store< u8>(u8 .!(201 + arg)); Pointer.atField(gv.v16).store(u16.!(202 + arg)); Pointer.atField(gv.v32).store(u32.!(203 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(gv.v64).store(u64.!(204 + arg)); - - // check the new values, using regular accesses + if (Pointer.SIZE == 8) Pointer.atField(gv.v64).store(u64.!(204 + arg)); + // check the new values, using regular accesses diff += (u32.view(gv.v8 ) ^ u32.!(201 + arg)) + (u32.view(gv.v16) ^ u32.!(202 + arg)) + (u32.view(gv.v32) ^ u32.!(203 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(gv.v64) ^ u32.!(204 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(gv.v64) ^ u32.!(204 + arg)); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField20.v3 b/test/pointer/Pointer_atUnboxedField20.v3 index 8de3d9337..2c60b7c51 100644 --- a/test/pointer/Pointer_atUnboxedField20.v3 +++ b/test/pointer/Pointer_atUnboxedField20.v3 @@ -7,27 +7,22 @@ component Comp { var compv = V(1, 2, 3, 4); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // store new values, using pointer stores - Pointer.atField(Comp.compv.v8 ).store< u8>(u8 .!(201 + arg)); Pointer.atField(Comp.compv.v16).store(u16.!(202 + arg)); Pointer.atField(Comp.compv.v32).store(u32.!(203 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(Comp.compv.v64).store(u64.!(204 + arg)); - - // check the new values, using regular accesses + if (Pointer.SIZE == 8) Pointer.atField(Comp.compv.v64).store(u64.!(204 + arg)); + // check the new values, using regular accesses diff += (u32.view(Comp.compv.v8 ) ^ u32.!(201 + arg)) + (u32.view(Comp.compv.v16) ^ u32.!(202 + arg)) + (u32.view(Comp.compv.v32) ^ u32.!(203 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(Comp.compv.v64) ^ u32.!(204 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(Comp.compv.v64) ^ u32.!(204 + arg)); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField21.v3 b/test/pointer/Pointer_atUnboxedField21.v3 index d46f010fe..ddfe754ac 100644 --- a/test/pointer/Pointer_atUnboxedField21.v3 +++ b/test/pointer/Pointer_atUnboxedField21.v3 @@ -12,27 +12,22 @@ class C { var gclsv = C.new(1, 2, 3, 4); -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // store new values, using pointer stores - Pointer.atField(gclsv.clsv.v8 ).store< u8>(u8 .!(201 + arg)); Pointer.atField(gclsv.clsv.v16).store(u16.!(202 + arg)); Pointer.atField(gclsv.clsv.v32).store(u32.!(203 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(gclsv.clsv.v64).store(u64.!(204 + arg)); - - // check the new values, using regular accesses + if (Pointer.SIZE == 8) Pointer.atField(gclsv.clsv.v64).store(u64.!(204 + arg)); + // check the new values, using regular accesses diff += (u32.view(gclsv.clsv.v8 ) ^ u32.!(201 + arg)) + (u32.view(gclsv.clsv.v16) ^ u32.!(202 + arg)) + (u32.view(gclsv.clsv.v32) ^ u32.!(203 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(gclsv.clsv.v64) ^ u32.!(204 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(gclsv.clsv.v64) ^ u32.!(204 + arg)); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField22.v3 b/test/pointer/Pointer_atUnboxedField22.v3 index 1366cbfaf..1357be7ff 100644 --- a/test/pointer/Pointer_atUnboxedField22.v3 +++ b/test/pointer/Pointer_atUnboxedField22.v3 @@ -14,17 +14,14 @@ component Comp { var compclsv = C.new(1, 2, 3, 4); } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; // store new values, using pointer stores - Pointer.atField(Comp.compclsv.clsv.v8 ).store< u8>(u8 .!(201 + arg)); Pointer.atField(Comp.compclsv.clsv.v16).store(u16.!(202 + arg)); Pointer.atField(Comp.compclsv.clsv.v32).store(u32.!(203 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(Comp.compclsv.clsv.v64).store(u64.!(204 + arg)); + if (Pointer.SIZE == 8) Pointer.atField(Comp.compclsv.clsv.v64).store(u64.!(204 + arg)); // check the new values, using regular accesses @@ -33,8 +30,7 @@ def main(arg: int) -> u64 { (u32.view(Comp.compclsv.clsv.v16) ^ u32.!(202 + arg)) + (u32.view(Comp.compclsv.clsv.v32) ^ u32.!(203 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(Comp.compclsv.clsv.v64) ^ u32.!(204 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(Comp.compclsv.clsv.v64) ^ u32.!(204 + arg)); return diff; } diff --git a/test/pointer/Pointer_atUnboxedField23.v3 b/test/pointer/Pointer_atUnboxedField23.v3 index caa59a6af..279196a8b 100644 --- a/test/pointer/Pointer_atUnboxedField23.v3 +++ b/test/pointer/Pointer_atUnboxedField23.v3 @@ -10,29 +10,23 @@ class C { } } -def main(arg: int) -> u64 { - +def main(arg: int) -> u32 { var diff: u32 = 0; - var lclsv = C.new(1, 2, 3, 4); // store new values, using pointer stores - Pointer.atField(lclsv.clsv.v8 ).store< u8>(u8 .!(201 + arg)); Pointer.atField(lclsv.clsv.v16).store(u16.!(202 + arg)); Pointer.atField(lclsv.clsv.v32).store(u32.!(203 + arg)); - if (Pointer.SIZE == 8) - Pointer.atField(lclsv.clsv.v64).store(u64.!(204 + arg)); - - // check the new values, using regular accesses + if (Pointer.SIZE == 8) Pointer.atField(lclsv.clsv.v64).store(u64.!(204 + arg)); + // check the new values, using regular accesses diff += (u32.view(lclsv.clsv.v8 ) ^ u32.!(201 + arg)) + (u32.view(lclsv.clsv.v16) ^ u32.!(202 + arg)) + (u32.view(lclsv.clsv.v32) ^ u32.!(203 + arg)); - if (Pointer.SIZE == 8) - diff += (u32.view(lclsv.clsv.v64) ^ u32.!(204 + arg)); + if (Pointer.SIZE == 8) diff += (u32.view(lclsv.clsv.v64) ^ u32.!(204 + arg)); - return diff; + return u32.!(diff); }