AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-09-12 14:01:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add utility functions to make function pointer casting more safe.

Browse Source 
It's now only changing the self parameter, everything else will be checked at compile-time.

fixes #1223
This commit is contained in:
IntegratedQuantum 2025-03-22 21:23:32 +01:00
parent 5845da7ca9
commit ac9f00cb32
8 changed files with 64 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio.zig
View File

@ -125,10 +125,10 @@ const MusicLoadTask = struct {
musicId: []const u8, musicId: []const u8,
const vtable = utils.ThreadPool.VTable{ const vtable = utils.ThreadPool.VTable{
.getPriority = @ptrCast(&getPriority), .getPriority = main.utils.castFunctionSelfToAnyopaque(getPriority),
.isStillNeeded = @ptrCast(&isStillNeeded), .isStillNeeded = main.utils.castFunctionSelfToAnyopaque(isStillNeeded),
.run = @ptrCast(&run), .run = main.utils.castFunctionSelfToAnyopaque(run),
.clean = @ptrCast(&clean), .clean = main.utils.castFunctionSelfToAnyopaque(clean),
.taskType = .misc, .taskType = .misc,
}; };

8
src/graphics/Window.zig
View File

@ -130,10 +130,10 @@ pub const Gamepad = struct {
curTimestamp: i128, curTimestamp: i128,
var running = std.atomic.Value(bool).init(false); var running = std.atomic.Value(bool).init(false);
const vtable = main.utils.ThreadPool.VTable{ const vtable = main.utils.ThreadPool.VTable{
.getPriority = @ptrCast(&getPriority), .getPriority = main.utils.castFunctionSelfToAnyopaque(getPriority),
.isStillNeeded = @ptrCast(&isStillNeeded), .isStillNeeded = main.utils.castFunctionSelfToAnyopaque(isStillNeeded),
.run = @ptrCast(&run), .run = main.utils.castFunctionSelfToAnyopaque(run),
.clean = @ptrCast(&clean), .clean = main.utils.castFunctionSelfToAnyopaque(clean),
}; };
pub fn schedule(curTimestamp: i128) void { pub fn schedule(curTimestamp: i128) void {

8
src/network.zig
View File

@ -1816,10 +1816,10 @@ const ProtocolTask = struct {
data: []const u8, data: []const u8,
const vtable = utils.ThreadPool.VTable{ const vtable = utils.ThreadPool.VTable{
.getPriority = @ptrCast(&getPriority), .getPriority = main.utils.castFunctionSelfToAnyopaque(getPriority),
.isStillNeeded = @ptrCast(&isStillNeeded), .isStillNeeded = main.utils.castFunctionSelfToAnyopaque(isStillNeeded),
.run = @ptrCast(&run), .run = main.utils.castFunctionSelfToAnyopaque(run),
.clean = @ptrCast(&clean), .clean = main.utils.castFunctionSelfToAnyopaque(clean),
.taskType = .misc, .taskType = .misc,
}; };

8
src/renderer/chunk_meshing.zig
View File

@ -707,10 +707,10 @@ pub const ChunkMesh = struct { // MARK: ChunkMesh
mesh: *ChunkMesh, mesh: *ChunkMesh,
pub const vtable = main.utils.ThreadPool.VTable{ pub const vtable = main.utils.ThreadPool.VTable{
.getPriority = @ptrCast(&getPriority), .getPriority = main.utils.castFunctionSelfToAnyopaque(getPriority),
.isStillNeeded = @ptrCast(&isStillNeeded), .isStillNeeded = main.utils.castFunctionSelfToAnyopaque(isStillNeeded),
.run = @ptrCast(&run), .run = main.utils.castFunctionSelfToAnyopaque(run),
.clean = @ptrCast(&clean), .clean = main.utils.castFunctionSelfToAnyopaque(clean),
.taskType = .misc, .taskType = .misc,
}; };

8
src/renderer/mesh_storage.zig
View File

@ -896,10 +896,10 @@ pub const MeshGenerationTask = struct { // MARK: MeshGenerationTask
mesh: *chunk.Chunk, mesh: *chunk.Chunk,
pub const vtable = utils.ThreadPool.VTable{ pub const vtable = utils.ThreadPool.VTable{
.getPriority = @ptrCast(&getPriority), .getPriority = main.utils.castFunctionSelfToAnyopaque(getPriority),
.isStillNeeded = @ptrCast(&isStillNeeded), .isStillNeeded = main.utils.castFunctionSelfToAnyopaque(isStillNeeded),
.run = @ptrCast(&run), .run = main.utils.castFunctionSelfToAnyopaque(run),
.clean = @ptrCast(&clean), .clean = main.utils.castFunctionSelfToAnyopaque(clean),
.taskType = .meshgenAndLighting, .taskType = .meshgenAndLighting,
}; };

6
src/server/terrain/biomes.zig
View File

@ -60,9 +60,9 @@ pub const SimpleStructureModel = struct { // MARK: SimpleStructureModel
pub fn registerGenerator(comptime Generator: type) void { pub fn registerGenerator(comptime Generator: type) void {
var self: VTable = undefined; var self: VTable = undefined;
self.loadModel = @ptrCast(&Generator.loadModel); self.loadModel = main.utils.castFunctionReturnToAnyopaque(Generator.loadModel);
self.generate = @ptrCast(&Generator.generate); self.generate = main.utils.castFunctionSelfToAnyopaque(Generator.generate);
self.hashFunction = @ptrCast(&struct { self.hashFunction = main.utils.castFunctionSelfToAnyopaque(struct {
fn hash(ptr: *Generator) u64 { fn hash(ptr: *Generator) u64 {
return hashGeneric(ptr.*); return hashGeneric(ptr.*);
} }

24
src/server/world.zig
View File

@ -134,10 +134,10 @@ const ChunkManager = struct { // MARK: ChunkManager
source: Source, source: Source,
const vtable = utils.ThreadPool.VTable{ const vtable = utils.ThreadPool.VTable{
.getPriority = @ptrCast(&getPriority), .getPriority = main.utils.castFunctionSelfToAnyopaque(getPriority),
.isStillNeeded = @ptrCast(&isStillNeeded), .isStillNeeded = main.utils.castFunctionSelfToAnyopaque(isStillNeeded),
.run = @ptrCast(&run), .run = main.utils.castFunctionSelfToAnyopaque(run),
.clean = @ptrCast(&clean), .clean = main.utils.castFunctionSelfToAnyopaque(clean),
.taskType = .chunkgen, .taskType = .chunkgen,
}; };
@ -194,10 +194,10 @@ const ChunkManager = struct { // MARK: ChunkManager
source: ?*User, source: ?*User,
const vtable = utils.ThreadPool.VTable{ const vtable = utils.ThreadPool.VTable{
.getPriority = @ptrCast(&getPriority), .getPriority = main.utils.castFunctionSelfToAnyopaque(getPriority),
.isStillNeeded = @ptrCast(&isStillNeeded), .isStillNeeded = main.utils.castFunctionSelfToAnyopaque(isStillNeeded),
.run = @ptrCast(&run), .run = main.utils.castFunctionSelfToAnyopaque(run),
.clean = @ptrCast(&clean), .clean = main.utils.castFunctionSelfToAnyopaque(clean),
.taskType = .misc, .taskType = .misc,
}; };
@ -583,10 +583,10 @@ pub const ServerWorld = struct { // MARK: ServerWorld
storeMaps: bool, storeMaps: bool,
const vtable = utils.ThreadPool.VTable{ const vtable = utils.ThreadPool.VTable{
.getPriority = @ptrCast(&getPriority), .getPriority = main.utils.castFunctionSelfToAnyopaque(getPriority),
.isStillNeeded = @ptrCast(&isStillNeeded), .isStillNeeded = main.utils.castFunctionSelfToAnyopaque(isStillNeeded),
.run = @ptrCast(&run), .run = main.utils.castFunctionSelfToAnyopaque(run),
.clean = @ptrCast(&clean), .clean = main.utils.castFunctionSelfToAnyopaque(clean),
.taskType = .chunkgen, .taskType = .chunkgen,
}; };

29
src/utils.zig
View File

@ -1494,3 +1494,32 @@ pub const BinaryWriter = struct {
self.data.append(delimiter); self.data.append(delimiter);
} }
}; };
// MARK: functionPtrCast()
fn CastFunctionSelfToAnyopaqueType(Fn: type) type {
var typeInfo = @typeInfo(Fn);
var params = typeInfo.@"fn".params[0..typeInfo.@"fn".params.len].*;
if(@sizeOf(params[0].type.?) != @sizeOf(*anyopaque) or @alignOf(params[0].type.?) != @alignOf(*anyopaque)) {
@compileError(std.fmt.comptimePrint("Cannot convert {} to *anyopaque", .{params[0].type.?}));
}
params[0].type = *anyopaque;
typeInfo.@"fn".params = params[0..];
return @Type(typeInfo);
}
/// Turns the first parameter into a anyopaque*
pub fn castFunctionSelfToAnyopaque(function: anytype) *const CastFunctionSelfToAnyopaqueType(@TypeOf(function)) {
return @ptrCast(&function);
}
fn CastFunctionReturnToAnyopaqueType(Fn: type) type {
var typeInfo = @typeInfo(Fn);
if(@sizeOf(typeInfo.@"fn".return_type.?) != @sizeOf(*anyopaque) or @alignOf(typeInfo.@"fn".return_type.?) != @alignOf(*anyopaque)) {
@compileError(std.fmt.comptimePrint("Cannot convert {} to *anyopaque", .{typeInfo.@"fn".return_type.?}));
}
typeInfo.@"fn".return_type = *anyopaque;
return @Type(typeInfo);
}
/// Turns the return parameter into a anyopaque*
pub fn castFunctionReturnToAnyopaque(function: anytype) *const CastFunctionReturnToAnyopaqueType(@TypeOf(function)) {
return @ptrCast(&function);
}