Removing alloy/core.h.

src/alloy/backend/ivm/ivm_assembler.cc

@@ -16,6 +16,7 @@
 #include <alloy/hir/hir_builder.h>
 #include <alloy/hir/label.h>
 #include <alloy/runtime/runtime.h>
+#include <xenia/profiling.h>
 
 namespace alloy {
 namespace backend {

src/alloy/backend/ivm/ivm_assembler.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_BACKEND_IVM_IVM_ASSEMBLER_H_
 #define ALLOY_BACKEND_IVM_IVM_ASSEMBLER_H_
 
-#include <alloy/core.h>
-
 #include <alloy/arena.h>
 #include <alloy/backend/assembler.h>
 

src/alloy/backend/ivm/ivm_backend.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_BACKEND_IVM_IVM_BACKEND_H_
 #define ALLOY_BACKEND_IVM_IVM_BACKEND_H_
 
-#include <alloy/core.h>
-
 #include <alloy/backend/backend.h>
 
 namespace alloy {

src/alloy/backend/ivm/ivm_function.h

@@ -10,47 +10,42 @@
 #ifndef ALLOY_BACKEND_IVM_IVM_FUNCTION_H_
 #define ALLOY_BACKEND_IVM_IVM_FUNCTION_H_
 
-#include <alloy/core.h>
 #include <alloy/backend/ivm/ivm_intcode.h>
 #include <alloy/runtime/function.h>
 #include <alloy/runtime/symbol_info.h>
 
-
 namespace alloy {
 namespace backend {
 namespace ivm {
 
-
 class IVMFunction : public runtime::Function {
-public:
+ public:
   IVMFunction(runtime::FunctionInfo* symbol_info);
   virtual ~IVMFunction();
 
   void Setup(TranslationContext& ctx);
 
-protected:
+ protected:
   virtual int AddBreakpointImpl(runtime::Breakpoint* breakpoint);
   virtual int RemoveBreakpointImpl(runtime::Breakpoint* breakpoint);
   virtual int CallImpl(runtime::ThreadState* thread_state,
                        uint64_t return_address);
 
-private:
+ private:
   IntCode* GetIntCodeAtSourceOffset(uint64_t offset);
   void OnBreakpointHit(runtime::ThreadState* thread_state, IntCode* i);
 
-private:
-  size_t          register_count_;
-  size_t          stack_size_;
-  size_t          intcode_count_;
-  IntCode*        intcodes_;
-  size_t          source_map_count_;
+ private:
+  size_t register_count_;
+  size_t stack_size_;
+  size_t intcode_count_;
+  IntCode* intcodes_;
+  size_t source_map_count_;
   SourceMapEntry* source_map_;
 };
 
-
 }  // namespace ivm
 }  // namespace backend
 }  // namespace alloy
 
-
 #endif  // ALLOY_BACKEND_IVM_IVM_FUNCTION_H_

src/alloy/backend/ivm/ivm_intcode.h

@@ -10,16 +10,14 @@
 #ifndef ALLOY_BACKEND_IVM_INTCODE_H_
 #define ALLOY_BACKEND_IVM_INTCODE_H_
 
-#include <alloy/core.h>
-
 #include <alloy/hir/instr.h>
 #include <alloy/hir/opcodes.h>
 
 namespace alloy {
 namespace runtime {
 class ThreadState;
-}
-}
+}  // namespace runtime
+}  // namespace alloy
 
 namespace alloy {
 namespace backend {

src/alloy/backend/ivm/ivm_stack.h

@@ -10,8 +10,6 @@
 #ifndef ALLOY_BACKEND_IVM_IVM_STACK_H_
 #define ALLOY_BACKEND_IVM_IVM_STACK_H_
 
-#include <alloy/core.h>
-
 #include <alloy/backend/ivm/ivm_intcode.h>
 
 namespace alloy {