mirror of
https://github.com/Ed94/Odin.git
synced 2026-07-28 18:30:06 +00:00
encoding/cbor: deterministically store bit sets as big endian
This commit is contained in:
@@ -675,21 +675,3 @@ _i128_to_uint :: proc(v: i128) -> (u: u64, m: Major, err: Encode_Data_Error) {
|
||||
u, err = _u128_to_u64(u128(v))
|
||||
return
|
||||
}
|
||||
|
||||
@(private)
|
||||
is_bit_set_different_endian_to_platform :: proc(ti: ^runtime.Type_Info) -> bool {
|
||||
if ti == nil {
|
||||
return false
|
||||
}
|
||||
t := runtime.type_info_base(ti)
|
||||
#partial switch info in t.variant {
|
||||
case runtime.Type_Info_Integer:
|
||||
switch info.endianness {
|
||||
case .Platform: return false
|
||||
case .Little: return ODIN_ENDIAN != .Little
|
||||
case .Big: return ODIN_ENDIAN != .Big
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
@@ -541,7 +541,8 @@ marshal_into_encoder :: proc(e: Encoder, v: any) -> (err: Marshal_Error) {
|
||||
return marshal_into(e, any{v.data, info.base.id})
|
||||
|
||||
case runtime.Type_Info_Bit_Set:
|
||||
do_byte_swap := is_bit_set_different_endian_to_platform(info.underlying)
|
||||
// Store bit_set as big endian just like the protocol.
|
||||
do_byte_swap := !reflect.bit_set_is_big_endian(v)
|
||||
switch ti.size * 8 {
|
||||
case 0:
|
||||
return _encode_u8(e.writer, 0)
|
||||
|
||||
@@ -856,12 +856,11 @@ _assign_int :: proc(val: any, i: $T) -> bool {
|
||||
case uintptr: dst = uintptr(i)
|
||||
case:
|
||||
ti := type_info_of(v.id)
|
||||
do_byte_swap := is_bit_set_different_endian_to_platform(ti)
|
||||
#partial switch info in ti.variant {
|
||||
case runtime.Type_Info_Bit_Set:
|
||||
if _, ok := ti.variant.(runtime.Type_Info_Bit_Set); ok {
|
||||
do_byte_swap := !reflect.bit_set_is_big_endian(v)
|
||||
switch ti.size * 8 {
|
||||
case 0:
|
||||
case 8:
|
||||
case 0: // no-op.
|
||||
case 8:
|
||||
x := (^u8)(v.data)
|
||||
x^ = u8(i)
|
||||
case 16:
|
||||
@@ -876,9 +875,9 @@ _assign_int :: proc(val: any, i: $T) -> bool {
|
||||
case:
|
||||
panic("unknown bit_size size")
|
||||
}
|
||||
case:
|
||||
return false
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user