Skip to content

stream: Implement BinaryStreamFormat #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
german77 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

stream: Implement BinaryStreamFormat #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3c954a
stream: Implement BinaryStreamFormat
german77 Dec 2, 2025
06a32c1
Apply decompme match
german77 Jan 25, 2026
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ add_library(sead OBJECT
include/stream/seadStreamSrc.h
modules/src/stream/seadRamStream.cpp
modules/src/stream/seadStream.cpp
modules/src/stream/seadStreamFormat.cpp

include/thread/seadAtomic.h
include/thread/seadCriticalSection.h
Expand Down
17 changes: 9 additions & 8 deletions include/prim/seadEndian.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class Endian
{
return cConvFuncTable.conv32[from ^ to](v);
}
static u32 convertU32(s32 endian, u32 v) { return cConvFuncTable.conv32[endian](v); }
static u64 convertU64(Types from, Types to, u64 v)
{
return cConvFuncTable.conv64[from ^ to](v);
Expand All @@ -74,9 +75,9 @@ class Endian
static s16 convertS16(Types from, Types to, s16 v) { return convertU16(from, to, v); }
static s32 convertS32(Types from, Types to, s32 v) { return convertU32(from, to, v); }
static s64 convertS64(Types from, Types to, s64 v) { return convertU64(from, to, v); }
static u32 convertF32(Types from, Types to, const void* ptr)
static f32 convertF32(s32 endian, const void* ptr)
{
return convertU32(from, to, *static_cast<const u32*>(ptr));
return BitUtil::bitCast<f32>(convertU32(endian, *static_cast<const u32*>(ptr)));
}

static u8 toHostU8(Types from, u8 v) { return convertU8(from, cHostEndian, v); }
Expand All @@ -95,15 +96,15 @@ class Endian
static s64 toHostS64(Types from, s64 v) { return toHostU64(from, v); }

static s8 fromHostS8(Types to, s8 v) { return fromHostU8(to, v); }
static s16 fromHostS16(Types to, s16 v) { return fromHostU8(to, v); }
static s32 fromHostS32(Types to, s32 v) { return fromHostU8(to, v); }
static s64 fromHostS64(Types to, s64 v) { return fromHostU8(to, v); }
static s16 fromHostS16(Types to, s16 v) { return fromHostU16(to, v); }
static s32 fromHostS32(Types to, s32 v) { return fromHostU32(to, v); }
static s64 fromHostS64(Types to, s64 v) { return fromHostU64(to, v); }

static f32 toHostF32(Types from, const u32* ptr)
static f32 toHostF32(Types from, const u32* ptr) { return convertF32(from ^ cHostEndian, ptr); }
static u32 fromHostF32(Types to, const f32* ptr)
{
return BitUtil::bitCast<f32>(convertF32(from, cHostEndian, ptr));
return convertU32(cHostEndian, to, *reinterpret_cast<const u32*>(ptr));
}
static u32 fromHostF32(Types to, const f32* ptr) { return convertF32(cHostEndian, to, ptr); }

private:
static const Types cHostEndian;
Expand Down
174 changes: 87 additions & 87 deletions include/stream/seadStreamFormat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,103 +11,103 @@ class StreamSrc;
class StreamFormat
{
public:
virtual u8 readU8(StreamSrc*, Endian::Types) = 0;
virtual u16 readU16(StreamSrc*, Endian::Types) = 0;
virtual u32 readU32(StreamSrc*, Endian::Types) = 0;
virtual u64 readU64(StreamSrc*, Endian::Types) = 0;
virtual s8 readS8(StreamSrc*, Endian::Types) = 0;
virtual s16 readS16(StreamSrc*, Endian::Types) = 0;
virtual s32 readS32(StreamSrc*, Endian::Types) = 0;
virtual s64 readS64(StreamSrc*, Endian::Types) = 0;
virtual f32 readF32(StreamSrc*, Endian::Types) = 0;
virtual void readBit(StreamSrc*, void*, u32) = 0;
virtual void readString(StreamSrc*, BufferedSafeString*, u32) = 0;
virtual u32 readMemBlock(StreamSrc*, void*, u32) = 0;
virtual void writeU8(StreamSrc*, Endian::Types, u8) = 0;
virtual void writeU16(StreamSrc*, Endian::Types, u16) = 0;
virtual void writeU32(StreamSrc*, Endian::Types, u32) = 0;
virtual void writeU64(StreamSrc*, Endian::Types, u64) = 0;
virtual void writeS8(StreamSrc*, Endian::Types, s8) = 0;
virtual void writeS16(StreamSrc*, Endian::Types, s16) = 0;
virtual void writeS32(StreamSrc*, Endian::Types, s32) = 0;
virtual void writeS64(StreamSrc*, Endian::Types, s64) = 0;
virtual void writeF32(StreamSrc*, Endian::Types, f32) = 0;
virtual void writeBit(StreamSrc*, const void*, u32) = 0;
virtual void writeString(StreamSrc*, const SafeString&, u32) = 0;
virtual void writeMemBlock(StreamSrc*, const void*, u32) = 0;
virtual void writeDecorationText(StreamSrc*, const SafeString&) = 0;
virtual void writeNullChar(StreamSrc*) = 0;
virtual void skip(StreamSrc*, u32) = 0;
virtual void flush(StreamSrc*) = 0;
virtual void rewind(StreamSrc*) = 0;
virtual u8 readU8(StreamSrc* src, Endian::Types endian) = 0;
virtual u16 readU16(StreamSrc* src, Endian::Types endian) = 0;
virtual u32 readU32(StreamSrc* src, Endian::Types endian) = 0;
virtual u64 readU64(StreamSrc* src, Endian::Types endian) = 0;
virtual s8 readS8(StreamSrc* src, Endian::Types endian) = 0;
virtual s16 readS16(StreamSrc* src, Endian::Types endian) = 0;
virtual s32 readS32(StreamSrc* src, Endian::Types endian) = 0;
virtual s64 readS64(StreamSrc* src, Endian::Types endian) = 0;
virtual f32 readF32(StreamSrc* src, Endian::Types endian) = 0;
virtual void readBit(StreamSrc* src, void* data, u32 bits) = 0;
virtual void readString(StreamSrc* src, BufferedSafeString* str, u32 size) = 0;
virtual u32 readMemBlock(StreamSrc* src, void* buffer, u32 size) = 0;
virtual void writeU8(StreamSrc* src, Endian::Types endian, u8 value) = 0;
virtual void writeU16(StreamSrc* src, Endian::Types endian, u16 value) = 0;
virtual void writeU32(StreamSrc* src, Endian::Types endian, u32 value) = 0;
virtual void writeU64(StreamSrc* src, Endian::Types endian, u64 value) = 0;
virtual void writeS8(StreamSrc* src, Endian::Types endian, s8 value) = 0;
virtual void writeS16(StreamSrc* src, Endian::Types endian, s16 value) = 0;
virtual void writeS32(StreamSrc* src, Endian::Types endian, s32 value) = 0;
virtual void writeS64(StreamSrc* src, Endian::Types endian, s64 value) = 0;
virtual void writeF32(StreamSrc* src, Endian::Types endian, f32 value) = 0;
virtual void writeBit(StreamSrc* src, const void* data, u32 bits) = 0;
virtual void writeString(StreamSrc* src, const SafeString& str, u32 size) = 0;
virtual void writeMemBlock(StreamSrc* src, const void* buffer, u32 size) = 0;
virtual void writeDecorationText(StreamSrc* src, const SafeString& text) = 0;
virtual void writeNullChar(StreamSrc* src) = 0;
virtual void skip(StreamSrc* src, u32 offset) = 0;
virtual void flush(StreamSrc* src) = 0;
virtual void rewind(StreamSrc* src) = 0;
};

class BinaryStreamFormat : public StreamFormat
{
public:
u8 readU8(StreamSrc*, Endian::Types) override;
u16 readU16(StreamSrc*, Endian::Types) override;
u32 readU32(StreamSrc*, Endian::Types) override;
u64 readU64(StreamSrc*, Endian::Types) override;
s8 readS8(StreamSrc*, Endian::Types) override;
s16 readS16(StreamSrc*, Endian::Types) override;
s32 readS32(StreamSrc*, Endian::Types) override;
s64 readS64(StreamSrc*, Endian::Types) override;
f32 readF32(StreamSrc*, Endian::Types) override;
void readBit(StreamSrc*, void*, u32) override;
void readString(StreamSrc*, BufferedSafeString*, u32) override;
u32 readMemBlock(StreamSrc*, void*, u32) override;
void writeU8(StreamSrc*, Endian::Types, u8) override;
void writeU16(StreamSrc*, Endian::Types, u16) override;
void writeU32(StreamSrc*, Endian::Types, u32) override;
void writeU64(StreamSrc*, Endian::Types, u64) override;
void writeS8(StreamSrc*, Endian::Types, s8) override;
void writeS16(StreamSrc*, Endian::Types, s16) override;
void writeS32(StreamSrc*, Endian::Types, s32) override;
void writeS64(StreamSrc*, Endian::Types, s64) override;
void writeF32(StreamSrc*, Endian::Types, f32) override;
void writeBit(StreamSrc*, const void*, u32) override;
void writeString(StreamSrc*, const SafeString&, u32) override;
void writeMemBlock(StreamSrc*, const void*, u32) override;
void writeDecorationText(StreamSrc*, const SafeString&) override;
void writeNullChar(StreamSrc*) override;
void skip(StreamSrc*, u32) override;
void flush(StreamSrc*) override;
void rewind(StreamSrc*) override;
u8 readU8(StreamSrc* src, Endian::Types endian) override;
u16 readU16(StreamSrc* src, Endian::Types endian) override;
u32 readU32(StreamSrc* src, Endian::Types endian) override;
u64 readU64(StreamSrc* src, Endian::Types endian) override;
s8 readS8(StreamSrc* src, Endian::Types endian) override;
s16 readS16(StreamSrc* src, Endian::Types endian) override;
s32 readS32(StreamSrc* src, Endian::Types endian) override;
s64 readS64(StreamSrc* src, Endian::Types endian) override;
f32 readF32(StreamSrc* src, Endian::Types endian) override;
void readBit(StreamSrc* src, void* data, u32 bits) override;
void readString(StreamSrc* src, BufferedSafeString* str, u32 size) override;
u32 readMemBlock(StreamSrc* src, void* buffer, u32 size) override;
void writeU8(StreamSrc* src, Endian::Types endian, u8 value) override;
void writeU16(StreamSrc* src, Endian::Types endian, u16 value) override;
void writeU32(StreamSrc* src, Endian::Types endian, u32 value) override;
void writeU64(StreamSrc* src, Endian::Types endian, u64 value) override;
void writeS8(StreamSrc* src, Endian::Types endian, s8 value) override;
void writeS16(StreamSrc* src, Endian::Types endian, s16 value) override;
void writeS32(StreamSrc* src, Endian::Types endian, s32 value) override;
void writeS64(StreamSrc* src, Endian::Types endian, s64 value) override;
void writeF32(StreamSrc* src, Endian::Types endian, f32 value) override;
void writeBit(StreamSrc* src, const void* data, u32 bits) override;
void writeString(StreamSrc* src, const SafeString& str, u32 size) override;
void writeMemBlock(StreamSrc* src, const void* buffer, u32 size) override;
void writeDecorationText(StreamSrc* src, const SafeString& text) override;
void writeNullChar(StreamSrc* src) override;
void skip(StreamSrc* src, u32 offset) override;
void flush(StreamSrc* src) override;
void rewind(StreamSrc* src) override;
};

class TextStreamFormat : public StreamFormat
{
public:
u8 readU8(StreamSrc*, Endian::Types) override;
u16 readU16(StreamSrc*, Endian::Types) override;
u32 readU32(StreamSrc*, Endian::Types) override;
u64 readU64(StreamSrc*, Endian::Types) override;
s8 readS8(StreamSrc*, Endian::Types) override;
s16 readS16(StreamSrc*, Endian::Types) override;
s32 readS32(StreamSrc*, Endian::Types) override;
s64 readS64(StreamSrc*, Endian::Types) override;
f32 readF32(StreamSrc*, Endian::Types) override;
void readBit(StreamSrc*, void*, u32) override;
void readString(StreamSrc*, BufferedSafeString*, u32) override;
u32 readMemBlock(StreamSrc*, void*, u32) override;
void writeU8(StreamSrc*, Endian::Types, u8) override;
void writeU16(StreamSrc*, Endian::Types, u16) override;
void writeU32(StreamSrc*, Endian::Types, u32) override;
void writeU64(StreamSrc*, Endian::Types, u64) override;
void writeS8(StreamSrc*, Endian::Types, s8) override;
void writeS16(StreamSrc*, Endian::Types, s16) override;
void writeS32(StreamSrc*, Endian::Types, s32) override;
void writeS64(StreamSrc*, Endian::Types, s64) override;
void writeF32(StreamSrc*, Endian::Types, f32) override;
void writeBit(StreamSrc*, const void*, u32) override;
void writeString(StreamSrc*, const SafeString&, u32) override;
void writeMemBlock(StreamSrc*, const void*, u32) override;
void writeDecorationText(StreamSrc*, const SafeString&) override;
void writeNullChar(StreamSrc*) override;
void skip(StreamSrc*, u32) override;
void flush(StreamSrc*) override;
void rewind(StreamSrc*) override;
u8 readU8(StreamSrc* src, Endian::Types endian) override;
u16 readU16(StreamSrc* src, Endian::Types endian) override;
u32 readU32(StreamSrc* src, Endian::Types endian) override;
u64 readU64(StreamSrc* src, Endian::Types endian) override;
s8 readS8(StreamSrc* src, Endian::Types endian) override;
s16 readS16(StreamSrc* src, Endian::Types endian) override;
s32 readS32(StreamSrc* src, Endian::Types endian) override;
s64 readS64(StreamSrc* src, Endian::Types endian) override;
f32 readF32(StreamSrc* src, Endian::Types endian) override;
void readBit(StreamSrc* src, void* data, u32 bits) override;
void readString(StreamSrc* src, BufferedSafeString* str, u32 size) override;
u32 readMemBlock(StreamSrc* src, void* buffer, u32 size) override;
void writeU8(StreamSrc* src, Endian::Types endian, u8 value) override;
void writeU16(StreamSrc* src, Endian::Types endian, u16 value) override;
void writeU32(StreamSrc* src, Endian::Types endian, u32 value) override;
void writeU64(StreamSrc* src, Endian::Types endian, u64 value) override;
void writeS8(StreamSrc* src, Endian::Types endian, s8 value) override;
void writeS16(StreamSrc* src, Endian::Types endian, s16 value) override;
void writeS32(StreamSrc* src, Endian::Types endian, s32 value) override;
void writeS64(StreamSrc* src, Endian::Types endian, s64 value) override;
void writeF32(StreamSrc* src, Endian::Types endian, f32 value) override;
void writeBit(StreamSrc* src, const void* data, u32 bits) override;
void writeString(StreamSrc* src, const SafeString& str, u32 size) override;
void writeMemBlock(StreamSrc* src, const void* buffer, u32 size) override;
void writeDecorationText(StreamSrc* src, const SafeString& text) override;
void writeNullChar(StreamSrc* src) override;
void skip(StreamSrc* src, u32 offset) override;
void flush(StreamSrc* src) override;
void rewind(StreamSrc* src) override;
};

} // namespace sead
Loading