3 files changed, 34 insertions, 12 deletions
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index e16dde7fc..5fd3bd7f5 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -91,17 +91,16 @@ void LogMessage(Class log_class, Level log_level,
 } // namespace Log
 
 #define LOG_GENERIC(log_class, log_level, ...) \
-    ::Log::LogMessage(::Log::Class::log_class, ::Log::Level::log_level, \
-        __FILE__, __LINE__, __func__, __VA_ARGS__)
+    ::Log::LogMessage(log_class, log_level, __FILE__, __LINE__, __func__, __VA_ARGS__)
 
 #ifdef _DEBUG
-#define LOG_TRACE(   log_class, ...) LOG_GENERIC(log_class, Trace,    __VA_ARGS__)
+#define LOG_TRACE(   log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Trace,    __VA_ARGS__)
 #else
 #define LOG_TRACE(   log_class, ...) (void(0))
 #endif
 
-#define LOG_DEBUG(   log_class, ...) LOG_GENERIC(log_class, Debug,    __VA_ARGS__)
-#define LOG_INFO(    log_class, ...) LOG_GENERIC(log_class, Info,     __VA_ARGS__)
-#define LOG_WARNING( log_class, ...) LOG_GENERIC(log_class, Warning,  __VA_ARGS__)
-#define LOG_ERROR(   log_class, ...) LOG_GENERIC(log_class, Error,    __VA_ARGS__)
-#define LOG_CRITICAL(log_class, ...) LOG_GENERIC(log_class, Critical, __VA_ARGS__)
+#define LOG_DEBUG(   log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Debug,    __VA_ARGS__)
+#define LOG_INFO(    log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Info,     __VA_ARGS__)
+#define LOG_WARNING( log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Warning,  __VA_ARGS__)
+#define LOG_ERROR(   log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Error,    __VA_ARGS__)
+#define LOG_CRITICAL(log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Critical, __VA_ARGS__)
diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp
index cf31f8d69..749a75b72 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 86f4a1fff..3d6eeb564 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; }