From 78e7c77ff55123c144f2344e03535af7d677aa12 Mon Sep 17 00:00:00 2001 From: Lioncash <mathew1800@gmail.com> Date: Fri, 21 Aug 2015 17:09:30 -0400 Subject: [PATCH] emitter: Remove pointer casts This should also technically silence quite a few ubsan warnings. --- src/common/x64/emitter.cpp | 23 +++++++++++++++++++++++ src/common/x64/emitter.h | 8 ++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp index cf31f8d69f..749a75b72c 100644 --- a/src/common/x64/emitter.cpp +++ b/src/common/x64/emitter.cpp @@ -109,6 +109,29 @@ u8 *XEmitter::GetWritableCodePtr() return code; } +void XEmitter::Write8(u8 value) +{ + *code++ = value; +} + +void XEmitter::Write16(u16 value) +{ + std::memcpy(code, &value, sizeof(u16)); + code += sizeof(u16); +} + +void XEmitter::Write32(u32 value) +{ + std::memcpy(code, &value, sizeof(u32)); + code += sizeof(u32); +} + +void XEmitter::Write64(u64 value) +{ + std::memcpy(code, &value, sizeof(u64)); + code += sizeof(u64); +} + void XEmitter::ReserveCodeSpace(int bytes) { for (int i = 0; i < bytes; i++) diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h index 86f4a1fff0..3d6eeb5643 100644 --- a/src/common/x64/emitter.h +++ b/src/common/x64/emitter.h @@ -359,10 +359,10 @@ private: void ABI_CalculateFrameSize(u32 mask, size_t rsp_alignment, size_t needed_frame_size, size_t* shadowp, size_t* subtractionp, size_t* xmm_offsetp); protected: - void Write8(u8 value) {*code++ = value;} - void Write16(u16 value) {*(u16*)code = (value); code += 2;} - void Write32(u32 value) {*(u32*)code = (value); code += 4;} - void Write64(u64 value) {*(u64*)code = (value); code += 8;} + void Write8(u8 value); + void Write16(u16 value); + void Write32(u32 value); + void Write64(u64 value); public: XEmitter() { code = nullptr; flags_locked = false; }