Starting to cleanup includes a bit. Still a mess.

src/alloy/backend/x64/x64_emitter.cc

@@ -265,7 +265,7 @@ uint64_t ResolveFunctionSymbol(void* raw_context, uint64_t symbol_info_ptr) {
 
 // Overwrite the call site.
 // The return address points to ReloadRCX work after the call.
-#if XE_WIN32_LIKE
+#if XE_LIKE_WIN32
   uint64_t return_address = reinterpret_cast<uint64_t>(_ReturnAddress());
 #else
   uint64_t return_address =

src/alloy/backend/x64/x64_tracers.cc

@@ -34,20 +34,6 @@ namespace x64 {
   DFLUSH();    \
   if (thread_state->thread_id() == TARGET_THREAD) printf
 
-// TODO(benvanik): properly pull out values.
-typedef union __declspec(align(16)) {
-  __m128 m128;
-  float m128_f32[4];
-  uint64_t m128_u64[2];
-  int8_t m128_i8[16];
-  int16_t m128_i16[8];
-  int32_t m128_i32[4];
-  int64_t m128_i64[2];
-  uint8_t m128_u8[16];
-  uint16_t m128_u16[8];
-  uint32_t m128_u32[4];
-} __m128_x;
-
 uint32_t GetTracingMode() {
   uint32_t mode = 0;
 #if ITRACE

src/alloy/hir/value.cc

@@ -136,7 +136,7 @@ void Value::SignExtend(TypeName target_type) {
           return;
       }
     default:
-      XEASSERTUNHANDLEDCASE();
+      XEASSERTUNHANDLEDCASE(type);
       return;
   }
 }

src/alloy/hir/value.h

@@ -49,7 +49,7 @@ static size_t GetTypeSize(TypeName type_name) {
       return 16;
     default:
       XEASSERTUNHANDLEDCASE(type_name);
-      break;
+      return 0;
   }
 }
 

src/alloy/runtime/debugger.h

@@ -12,6 +12,7 @@
 
 #include <map>
 #include <mutex>
+#include <unordered_map>
 
 #include <alloy/core.h>
 

src/alloy/runtime/entry_table.h

@@ -11,6 +11,7 @@
 #define ALLOY_RUNTIME_ENTRY_TABLE_H_
 
 #include <mutex>
+#include <unordered_map>
 
 #include <alloy/core.h>