Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ jobs:
- name: Install Rust (nightly)
run: |
rustup toolchain install nightly --profile minimal --no-self-update
rustup +nightly target add x86_64-unknown-linux-gnu i686-unknown-linux-gnu
rustup +nightly target add x86_64-unknown-linux-gnu i686-unknown-linux-gnu powerpc64-unknown-linux-gnu
rustup +nightly component add miri

- name: Cache cargo registry & target
Expand Down Expand Up @@ -349,6 +349,13 @@ jobs:
cargo +nightly miri test --target i686-unknown-linux-gnu --no-default-features --test ffi_strings
cargo +nightly miri test --target i686-unknown-linux-gnu --no-default-features --test ffi_ops_interleave

- name: Miri FFI tests powerpc64 (big-endian validation)
run: |
cargo +nightly miri test --target powerpc64-unknown-linux-gnu --no-default-features --test ffi_smoke
cargo +nightly miri test --target powerpc64-unknown-linux-gnu --no-default-features --test ffi_cursor
cargo +nightly miri test --target powerpc64-unknown-linux-gnu --no-default-features --test ffi_strings
cargo +nightly miri test --target powerpc64-unknown-linux-gnu --no-default-features --test ffi_ops_interleave

- name: ASan FFI smoke tests
continue-on-error: true
env:
Expand Down
6 changes: 6 additions & 0 deletions src/scan/avx2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#![cfg(target_arch = "x86_64")]
// ENDIAN NOTE: This module is x86_64-only (always little-endian). The
// _mm256_movemask_epi8 intrinsic produces a 32-bit mask where bit i corresponds
// to the sign bit of lane i; combined masks are composed as (lo | (hi << 32)).
// This bit-index-to-lane mapping is fixed by the x86 ISA, not memory byte order,
// so the code is correct on x86_64 without explicit endian handling. PowerPC
// (big-endian) CI coverage runs the scalar scanner only.

use core::arch::x86_64::*;
use super::Scanner;
Expand Down
44 changes: 22 additions & 22 deletions tests/ffi_cursor.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::os::raw::c_int;
use std::os::raw::{c_char, c_int};
use qjson::ffi::*;

fn parse(s: &[u8]) -> *mut qjson_doc {
Expand All @@ -13,21 +13,21 @@ fn open_object_then_get_field() {
let d = parse(b"{\"body\":{\"model\":\"gpt\",\"temperature\":0.5}}");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let p = b"body";
let rc = unsafe { qjson_open(d, p.as_ptr() as *const i8, p.len(), c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, p.as_ptr() as *const c_char, p.len(), c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

let mut pp: *const u8 = std::ptr::null();
let mut nn: usize = 0;
let k = b"model";
let rc = unsafe { qjson_cursor_get_str(&c, k.as_ptr() as *const i8, k.len(), &mut pp, &mut nn) };
let rc = unsafe { qjson_cursor_get_str(&c, k.as_ptr() as *const c_char, k.len(), &mut pp, &mut nn) };
assert_eq!(rc, 0);
let s = unsafe { std::slice::from_raw_parts(pp, nn) };
assert_eq!(s, b"gpt");

let mut f: f64 = 0.0;
let k = b"temperature";
let rc = unsafe { qjson_cursor_get_f64(&c, k.as_ptr() as *const i8, k.len(), &mut f) };
let rc = unsafe { qjson_cursor_get_f64(&c, k.as_ptr() as *const c_char, k.len(), &mut f) };
assert_eq!(rc, 0);
assert!((f - 0.5).abs() < 1e-12);

Expand All @@ -39,7 +39,7 @@ fn cursor_index_array() {
let d = parse(b"[\"a\",\"b\",\"c\"]");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let p = b"";
let rc = unsafe { qjson_open(d, p.as_ptr() as *const i8, 0, c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, p.as_ptr() as *const c_char, 0, c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

Expand All @@ -51,7 +51,7 @@ fn cursor_index_array() {
let mut pp: *const u8 = std::ptr::null();
let mut nn: usize = 0;
let empty = b"";
let rc = unsafe { qjson_cursor_get_str(&sub, empty.as_ptr() as *const i8, 0, &mut pp, &mut nn) };
let rc = unsafe { qjson_cursor_get_str(&sub, empty.as_ptr() as *const c_char, 0, &mut pp, &mut nn) };
assert_eq!(rc, 0);
assert_eq!(unsafe { std::slice::from_raw_parts(pp, nn) }, b"b");

Expand All @@ -63,19 +63,19 @@ fn cursor_field_with_dotted_key() {
let d = parse(b"{\"a.b\":42}");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let p = b"";
let rc = unsafe { qjson_open(d, p.as_ptr() as *const i8, 0, c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, p.as_ptr() as *const c_char, 0, c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

let mut sub = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let key = b"a.b";
let rc = unsafe { qjson_cursor_field(&c, key.as_ptr() as *const i8, key.len(), sub.as_mut_ptr()) };
let rc = unsafe { qjson_cursor_field(&c, key.as_ptr() as *const c_char, key.len(), sub.as_mut_ptr()) };
assert_eq!(rc, 0);

let sub = unsafe { sub.assume_init() };
let mut v: i64 = 0;
let empty = b"";
let rc = unsafe { qjson_cursor_get_i64(&sub, empty.as_ptr() as *const i8, 0, &mut v) };
let rc = unsafe { qjson_cursor_get_i64(&sub, empty.as_ptr() as *const c_char, 0, &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, 42);

Expand All @@ -91,7 +91,7 @@ fn walk_children_trailing_scalar_integer() {
let d = parse(b"[10,20,30]");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let empty = b"";
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const i8, 0, c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const c_char, 0, c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

Expand All @@ -102,7 +102,7 @@ fn walk_children_trailing_scalar_integer() {
let sub = unsafe { sub.assume_init() };

let mut v: i64 = 0;
let rc = unsafe { qjson_cursor_get_i64(&sub, empty.as_ptr() as *const i8, 0, &mut v) };
let rc = unsafe { qjson_cursor_get_i64(&sub, empty.as_ptr() as *const c_char, 0, &mut v) };
assert_eq!(rc, 0, "qjson_cursor_get_i64 on trailing element must succeed");
assert_eq!(v, 30);

Expand All @@ -116,7 +116,7 @@ fn walk_children_trailing_scalar_bool() {
let d = parse(b"[1,\"x\",true]");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let empty = b"";
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const i8, 0, c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const c_char, 0, c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

Expand All @@ -127,7 +127,7 @@ fn walk_children_trailing_scalar_bool() {
let sub = unsafe { sub.assume_init() };

let mut b: c_int = -1;
let rc = unsafe { qjson_cursor_get_bool(&sub, empty.as_ptr() as *const i8, 0, &mut b) };
let rc = unsafe { qjson_cursor_get_bool(&sub, empty.as_ptr() as *const c_char, 0, &mut b) };
assert_eq!(rc, 0, "qjson_cursor_get_bool on trailing `true` must succeed");
assert_eq!(b, 1);

Expand All @@ -139,17 +139,17 @@ fn open_root_number_cursor_gets_f64() {
let d = parse(b"42");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let empty = b"";
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const i8, 0, c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const c_char, 0, c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

let mut t: c_int = -1;
let rc = unsafe { qjson_cursor_typeof(&c, empty.as_ptr() as *const i8, 0, &mut t) };
let rc = unsafe { qjson_cursor_typeof(&c, empty.as_ptr() as *const c_char, 0, &mut t) };
assert_eq!(rc, 0);
assert_eq!(t, 2);

let mut v: f64 = 0.0;
let rc = unsafe { qjson_cursor_get_f64(&c, empty.as_ptr() as *const i8, 0, &mut v) };
let rc = unsafe { qjson_cursor_get_f64(&c, empty.as_ptr() as *const c_char, 0, &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, 42.0);

Expand All @@ -162,24 +162,24 @@ fn open_root_bool_and_null_cursors() {

let d = parse(b"true");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const i8, 0, c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const c_char, 0, c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

let mut b: c_int = -1;
let rc = unsafe { qjson_cursor_get_bool(&c, empty.as_ptr() as *const i8, 0, &mut b) };
let rc = unsafe { qjson_cursor_get_bool(&c, empty.as_ptr() as *const c_char, 0, &mut b) };
assert_eq!(rc, 0);
assert_eq!(b, 1);
unsafe { qjson_free(d) };

let d = parse(b"null");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const i8, 0, c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const c_char, 0, c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

let mut t: c_int = -1;
let rc = unsafe { qjson_cursor_typeof(&c, empty.as_ptr() as *const i8, 0, &mut t) };
let rc = unsafe { qjson_cursor_typeof(&c, empty.as_ptr() as *const c_char, 0, &mut t) };
assert_eq!(rc, 0);
assert_eq!(t, 0);

Expand All @@ -191,12 +191,12 @@ fn root_scalar_cursor_container_ops_return_type_mismatch() {
let d = parse(b"42");
let mut c = std::mem::MaybeUninit::<qjson_cursor>::uninit();
let empty = b"";
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const i8, 0, c.as_mut_ptr()) };
let rc = unsafe { qjson_open(d, empty.as_ptr() as *const c_char, 0, c.as_mut_ptr()) };
assert_eq!(rc, 0);
let c = unsafe { c.assume_init() };

let mut len = 0usize;
let rc = unsafe { qjson_cursor_len(&c, empty.as_ptr() as *const i8, 0, &mut len) };
let rc = unsafe { qjson_cursor_len(&c, empty.as_ptr() as *const c_char, 0, &mut len) };
assert_eq!(rc, 3);

let mut key_ptr: *const u8 = std::ptr::null();
Expand Down
42 changes: 21 additions & 21 deletions tests/ffi_numbers.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::os::raw::c_int;
use std::os::raw::{c_char, c_int};
use qjson::ffi::*;

fn parse(s: &[u8]) -> *mut qjson_doc {
Expand All @@ -13,7 +13,7 @@ fn get_i64_basic() {
let d = parse(b"{\"a\":42}");
let mut v: i64 = 0;
let p = b"a";
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, 42);
unsafe { qjson_free(d) };
Expand All @@ -24,7 +24,7 @@ fn get_i64_negative() {
let d = parse(b"{\"a\":-7}");
let mut v: i64 = 0;
let p = b"a";
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, -7);
unsafe { qjson_free(d) };
Expand All @@ -35,7 +35,7 @@ fn get_i64_overflow() {
let d = parse(b"{\"a\":99999999999999999999}");
let mut v: i64 = 0;
let p = b"a";
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 4); // OUT_OF_RANGE
unsafe { qjson_free(d) };
}
Expand All @@ -45,7 +45,7 @@ fn get_f64_basic() {
let d = parse(b"{\"a\":1.7}");
let mut v: f64 = 0.0;
let p = b"a";
let rc = unsafe { qjson_get_f64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_f64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert!((v - 1.7).abs() < 1e-12);
unsafe { qjson_free(d) };
Expand All @@ -56,11 +56,11 @@ fn get_bool() {
let d = parse(b"{\"a\":true,\"b\":false}");
let mut v: c_int = -1;
let p = b"a";
let rc = unsafe { qjson_get_bool(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_bool(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_ne!(v, 0);
let p = b"b";
let rc = unsafe { qjson_get_bool(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_bool(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, 0);
unsafe { qjson_free(d) };
Expand All @@ -72,11 +72,11 @@ fn get_i64_max_and_min() {
let d = parse(json.as_bytes());
let mut v: i64 = 0;
let p = b"hi";
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, i64::MAX);
let p = b"lo";
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, i64::MIN);
unsafe { qjson_free(d) };
Expand All @@ -88,7 +88,7 @@ fn get_i64_just_over_max_overflows() {
let d = parse(b"{\"a\":9223372036854775808}");
let mut v: i64 = 0;
let p = b"a";
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 4); // OUT_OF_RANGE
unsafe { qjson_free(d) };
}
Expand All @@ -98,7 +98,7 @@ fn get_i64_returns_type_mismatch_for_non_numbers() {
let d = parse(b"{\"b\":true,\"s\":\"1\",\"n\":null}");
let mut v: i64 = 0;
for p in [b"b".as_slice(), b"s".as_slice(), b"n".as_slice()] {
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 3); // TYPE_MISMATCH
}
unsafe { qjson_free(d) };
Expand All @@ -110,7 +110,7 @@ fn get_u64_max() {
let d = parse(json.as_bytes());
let mut v: u64 = 0;
let p = b"a";
let rc = unsafe { qjson_get_u64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_u64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, u64::MAX);
unsafe { qjson_free(d) };
Expand All @@ -121,10 +121,10 @@ fn get_u64_rejects_negative_and_overflow() {
let d = parse(b"{\"neg\":-1,\"too_big\":18446744073709551616}");
let mut v: u64 = 0;
let p = b"neg";
let rc = unsafe { qjson_get_u64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_u64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 4); // OUT_OF_RANGE
let p = b"too_big";
let rc = unsafe { qjson_get_u64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_u64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 4); // OUT_OF_RANGE
unsafe { qjson_free(d) };
}
Expand All @@ -134,7 +134,7 @@ fn get_u64_rejects_float_and_non_numbers() {
let d = parse(b"{\"f\":1.5,\"b\":true,\"s\":\"1\",\"n\":null}");
let mut v: u64 = 0;
for p in [b"f".as_slice(), b"b".as_slice(), b"s".as_slice(), b"n".as_slice()] {
let rc = unsafe { qjson_get_u64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_u64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 3); // TYPE_MISMATCH
}
unsafe { qjson_free(d) };
Expand All @@ -152,11 +152,11 @@ fn cursor_get_u64_max() {
_reserved1: 0,
};
let p = b"root";
let rc = unsafe { qjson_open(d, p.as_ptr() as *const i8, p.len(), &mut cur) };
let rc = unsafe { qjson_open(d, p.as_ptr() as *const c_char, p.len(), &mut cur) };
assert_eq!(rc, 0);
let mut v: u64 = 0;
let p = b"a";
let rc = unsafe { qjson_cursor_get_u64(&cur, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_cursor_get_u64(&cur, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, u64::MAX);
unsafe { qjson_free(d) };
Expand All @@ -167,7 +167,7 @@ fn get_f64_large_magnitude() {
let d = parse(b"{\"a\":1.7e308}");
let mut v: f64 = 0.0;
let p = b"a";
let rc = unsafe { qjson_get_f64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_f64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert!(v > 1.0e308 && v < f64::INFINITY);
unsafe { qjson_free(d) };
Expand All @@ -178,11 +178,11 @@ fn get_f64_negative_zero_and_exponent() {
let d = parse(b"{\"a\":-0.0,\"b\":1e-300}");
let mut v: f64 = 1.0;
let p = b"a";
let rc = unsafe { qjson_get_f64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_f64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert_eq!(v, 0.0);
let p = b"b";
let rc = unsafe { qjson_get_f64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_f64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_eq!(rc, 0);
assert!(v > 0.0 && v < 1e-200);
unsafe { qjson_free(d) };
Expand All @@ -193,7 +193,7 @@ fn get_i64_rejects_float_form() {
let d = parse(b"{\"a\":1.5}");
let mut v: i64 = 0;
let p = b"a";
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const i8, p.len(), &mut v) };
let rc = unsafe { qjson_get_i64(d, p.as_ptr() as *const c_char, p.len(), &mut v) };
assert_ne!(rc, 0); // any error code is acceptable; not a valid i64
unsafe { qjson_free(d) };
}
Loading
Loading