Skip to content

Commit c3d3344

Browse files
jacobly0jacobly0
committed
x86_64: pass more behavior tests
1 parent 666d76d commit c3d3344

File tree

7 files changed

+343
-348
lines changed

7 files changed

+343
-348
lines changed

‎src/arch/x86_64/CodeGen.zig‎

Lines changed: 339 additions & 338 deletions
Large diffs are not rendered by default.

‎test/behavior/basic.zig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,10 +1169,10 @@ test "arrays and vectors with big integers" {
11691169
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
11701170
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
11711171
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
1172+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
11721173
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
11731174
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
11741175
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1175-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
11761176

11771177
inline for (.{ u65528, u65529, u65535 }) |Int| {
11781178
var a: [1]Int = undefined;

‎test/behavior/cast.zig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2539,7 +2539,6 @@ test "@intFromBool on vector" {
25392539
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
25402540
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
25412541
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2542-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
25432542
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
25442543

25452544
const S = struct {

‎test/behavior/math.zig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,6 @@ test "division" {
472472
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
473473
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
474474
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
475-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
476475
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
477476
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
478477

@@ -588,7 +587,7 @@ fn testFloatDivision() !void {
588587
}
589588

590589
test "large integer division" {
591-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
590+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
592591
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
593592
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
594593
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;

‎test/behavior/optional.zig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn testNullPtrsEql() !void {
5757

5858
test "optional with zero-bit type" {
5959
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
60-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
60+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
6161
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
6262

6363
const S = struct {

‎test/behavior/packed-union.zig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ test "packed union initialized with a runtime value" {
138138
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
139139
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
140140
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
141-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
142141
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
143142

144143
const Fields = packed struct {

‎test/behavior/vector.zig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ test "array vector coercion - odd sizes" {
205205
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
206206
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
207207
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
208-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
209208
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
210209
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
211210

@@ -308,7 +307,6 @@ test "tuple to vector" {
308307

309308
test "vector casts of sizes not divisible by 8" {
310309
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
311-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
312310
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
313311
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
314312
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
@@ -1363,7 +1361,7 @@ test "load packed vector element" {
13631361
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
13641362
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
13651363
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
1366-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
1364+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
13671365
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
13681366

13691367
var x: @Vector(2, u15) = .{ 1, 4 };
@@ -1411,7 +1409,6 @@ test "store vector with memset" {
14111409
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
14121410
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
14131411
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
1414-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
14151412
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
14161413
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
14171414
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO

0 commit comments

Comments
 (0)