diff options
| author | Sean Gillespie <sean.william.g@gmail.com> | 2016-09-08 13:06:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 13:06:21 -0700 |
| commit | 1c43df95410e57f0d40e6ee55012ef65bdac2487 (patch) | |
| tree | b57fda7959af77de7c77353e5a5dd70a77f7d0dd /src/vm/amd64 | |
| parent | 65c2ff78e0e88f5052751747f6686084caab3d4c (diff) | |
| parent | 6519911fbccbec049f9592484f69c213b4b78264 (diff) | |
| download | coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.tar.gz coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.tar.bz2 coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.zip | |
Merge pull request #6764 from swgillespie/gc-interface-3
Move the GC behind an interface and use that interface in the VM
Diffstat (limited to 'src/vm/amd64')
| -rw-r--r-- | src/vm/amd64/asmconstants.h | 4 | ||||
| -rw-r--r-- | src/vm/amd64/excepamd64.cpp | 2 | ||||
| -rw-r--r-- | src/vm/amd64/jitinterfaceamd64.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/vm/amd64/asmconstants.h b/src/vm/amd64/asmconstants.h index 32b23c83c3..ad90dd17ad 100644 --- a/src/vm/amd64/asmconstants.h +++ b/src/vm/amd64/asmconstants.h @@ -164,10 +164,10 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__Thread__m_ThreadId == offsetof(Thread, m_ThreadId)); #define OFFSET__Thread__m_alloc_context__alloc_ptr 0x60 -ASMCONSTANTS_C_ASSERT(OFFSET__Thread__m_alloc_context__alloc_ptr == offsetof(Thread, m_alloc_context) + offsetof(alloc_context, alloc_ptr)); +ASMCONSTANTS_C_ASSERT(OFFSET__Thread__m_alloc_context__alloc_ptr == offsetof(Thread, m_alloc_context) + offsetof(gc_alloc_context, alloc_ptr)); #define OFFSET__Thread__m_alloc_context__alloc_limit 0x68 -ASMCONSTANTS_C_ASSERT(OFFSET__Thread__m_alloc_context__alloc_limit == offsetof(Thread, m_alloc_context) + offsetof(alloc_context, alloc_limit)); +ASMCONSTANTS_C_ASSERT(OFFSET__Thread__m_alloc_context__alloc_limit == offsetof(Thread, m_alloc_context) + offsetof(gc_alloc_context, alloc_limit)); #define OFFSETOF__ThreadExceptionState__m_pCurrentTracker 0x000 ASMCONSTANTS_C_ASSERT(OFFSETOF__ThreadExceptionState__m_pCurrentTracker diff --git a/src/vm/amd64/excepamd64.cpp b/src/vm/amd64/excepamd64.cpp index 2fc553a987..d4248e7b07 100644 --- a/src/vm/amd64/excepamd64.cpp +++ b/src/vm/amd64/excepamd64.cpp @@ -21,7 +21,7 @@ #include "comutilnative.h" #include "sigformat.h" #include "siginfo.hpp" -#include "gc.h" +#include "gcheaputilities.h" #include "eedbginterfaceimpl.h" //so we can clearexception in COMPlusThrow #include "perfcounters.h" #include "asmconstants.h" diff --git a/src/vm/amd64/jitinterfaceamd64.cpp b/src/vm/amd64/jitinterfaceamd64.cpp index 39c2e05c2f..d5dec8e6e8 100644 --- a/src/vm/amd64/jitinterfaceamd64.cpp +++ b/src/vm/amd64/jitinterfaceamd64.cpp @@ -390,7 +390,7 @@ bool WriteBarrierManager::NeedDifferentWriteBarrier(bool bReqUpperBoundsCheck, W } #endif - writeBarrierType = GCHeap::IsServerHeap() ? WRITE_BARRIER_SVR64 : WRITE_BARRIER_PREGROW64; + writeBarrierType = GCHeapUtilities::IsServerHeap() ? WRITE_BARRIER_SVR64 : WRITE_BARRIER_PREGROW64; continue; case WRITE_BARRIER_PREGROW64: |