Merge pull request #2110 from janvorli/refactor-gc-types

Refactor gc types

14 files changed, 21 insertions, 21 deletions

diff --git a/src/vm/amd64/JitHelpers_Slow.asm b/src/vm/amd64/JitHelpers_Slow.asm
index 202ea43dcf..58ba5b6983 100644
--- a/src/vm/amd64/JitHelpers_Slow.asm
+++ b/src/vm/amd64/JitHelpers_Slow.asm
@@ -454,7 +454,7 @@ NESTED_END JIT_NewArr1OBJ_MP, _TEXT
 ;        Unfortunately, the compiler intrinsic for InterlockedExchangePointer seems to be broken and we
 ;        get bad code gen in gc.cpp on IA64. </TODO>
 
-M_GCLOCK equ ?m_GCLock@@3JC
+M_GCLOCK equ ?m_GCLock@@3HC
 extern M_GCLOCK:dword
 extern generation_table:qword
 
diff --git a/src/vm/amd64/jitinterfaceamd64.cpp b/src/vm/amd64/jitinterfaceamd64.cpp
index a5b35e1db2..128e6af328 100644
--- a/src/vm/amd64/jitinterfaceamd64.cpp
+++ b/src/vm/amd64/jitinterfaceamd64.cpp
@@ -18,9 +18,9 @@
 #include "excep.h"
 #include "threadsuspend.h"
 
-extern BYTE* g_ephemeral_low; 
-extern BYTE* g_ephemeral_high;
-extern DWORD*  g_card_table;
+extern uint8_t* g_ephemeral_low;
+extern uint8_t* g_ephemeral_high;
+extern uint32_t* g_card_table;
 
 // Patch Labels for the various write barriers
 EXTERN_C void JIT_WriteBarrier_End();
diff --git a/src/vm/compile.cpp b/src/vm/compile.cpp
index f9f7e5dd98..39830f5a00 100644
--- a/src/vm/compile.cpp
+++ b/src/vm/compile.cpp
@@ -1428,7 +1428,7 @@ void CEECompileInfo::GetAssemblyCodeBase(CORINFO_ASSEMBLY_HANDLE hAssembly, SStr
 
 //=================================================================================
 
-void FakePromote(PTR_PTR_Object ppObj, ScanContext *pSC, DWORD dwFlags)
+void FakePromote(PTR_PTR_Object ppObj, ScanContext *pSC, uint32_t dwFlags)
 {
     CONTRACTL {
         NOTHROW;
@@ -1442,7 +1442,7 @@ void FakePromote(PTR_PTR_Object ppObj, ScanContext *pSC, DWORD dwFlags)
 
 //=================================================================================
 
-void FakePromoteCarefully(promote_func *fn, Object **ppObj, ScanContext *pSC, DWORD dwFlags)
+void FakePromoteCarefully(promote_func *fn, Object **ppObj, ScanContext *pSC, uint32_t dwFlags)
 {
     (*fn)(ppObj, pSC, dwFlags);
 }
diff --git a/src/vm/crossgencompile.cpp b/src/vm/crossgencompile.cpp
index a14c166bf8..4ef1b58383 100644
--- a/src/vm/crossgencompile.cpp
+++ b/src/vm/crossgencompile.cpp
@@ -134,7 +134,7 @@ BOOL g_fEEComActivatedStartup=FALSE;
 GVAL_IMPL_INIT(DWORD, g_fHostConfig, 0);
 
 #ifdef FEATURE_SVR_GC
-SVAL_IMPL_INIT(DWORD,GCHeap,gcHeapType,GCHeap::GC_HEAP_WKS);
+SVAL_IMPL_INIT(uint32_t,GCHeap,gcHeapType,GCHeap::GC_HEAP_WKS);
 #endif
 
 void UpdateGCSettingFromHost()
diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp
index dbbfac9000..039385d414 100644
--- a/src/vm/eetwain.cpp
+++ b/src/vm/eetwain.cpp
@@ -4708,7 +4708,7 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY     pContext,
 
 #if defined(_DEBUG) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
         // Note that I really want to say hCallBack is a GCCONTEXT, but this is pretty close
-        extern void GcEnumObject(LPVOID pData, OBJECTREF *pObj, DWORD flags);
+        extern void GcEnumObject(LPVOID pData, OBJECTREF *pObj, uint32_t flags);
         _ASSERTE((void*) GcEnumObject == pCallBack);
 #endif
         GCCONTEXT   *pCtx = (GCCONTEXT *) hCallBack;
@@ -4961,7 +4961,7 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY     pRD,
 
 #if defined(_DEBUG) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
         // Note that I really want to say hCallBack is a GCCONTEXT, but this is pretty close
-        extern void GcEnumObject(LPVOID pData, OBJECTREF *pObj, DWORD flags);
+        extern void GcEnumObject(LPVOID pData, OBJECTREF *pObj, uint32_t flags);
         _ASSERTE((void*) GcEnumObject == pCallBack);
 #endif
         GCCONTEXT   *pCtx = (GCCONTEXT *) hCallBack;
diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp
index 0e09665f0d..c3deb0d35b 100644
--- a/src/vm/eventtrace.cpp
+++ b/src/vm/eventtrace.cpp
@@ -1340,7 +1340,7 @@ void BulkComLogger::LogAllComObjects()
     // We need to do work in HandleWalkCallback which may trigger a GC.  We cannot do this while
     // enumerating the handle table.  Instead, we will build a list of RefCount handles we found
     // during the handle table enumeration first (m_enumResult) during this enumeration:
-    Ref_TraceRefCountHandles(BulkComLogger::HandleWalkCallback, LPARAM(this), 0);
+    Ref_TraceRefCountHandles(BulkComLogger::HandleWalkCallback, uintptr_t(this), 0);
 
     // Now that we have all of the object handles, we will walk all of the handles and write the
     // etw events.
@@ -1381,7 +1381,7 @@ void BulkComLogger::LogAllComObjects()
 
 }
 
-void BulkComLogger::HandleWalkCallback(Object **handle, LPARAM *pExtraInfo, LPARAM param1, LPARAM param2)
+void BulkComLogger::HandleWalkCallback(Object **handle, uintptr_t *pExtraInfo, uintptr_t param1, uintptr_t param2)
 {
     CONTRACTL 
     {
diff --git a/src/vm/eventtracepriv.h b/src/vm/eventtracepriv.h
index 191f0d37b3..d12ba891d3 100644
--- a/src/vm/eventtracepriv.h
+++ b/src/vm/eventtracepriv.h
@@ -342,7 +342,7 @@ private:
     void FlushCcw();
 
     // Callback used during handle table enumeration.
-    static void HandleWalkCallback(PTR_UNCHECKED_OBJECTREF pref, LPARAM *pExtraInfo, LPARAM param1, LPARAM param2);
+    static void HandleWalkCallback(PTR_UNCHECKED_OBJECTREF pref, uintptr_t *pExtraInfo, uintptr_t param1, uintptr_t param2);
 
     // Used during CCW enumeration to keep track of all object handles which point to a CCW.
     void AddCcwHandle(Object **handle);
diff --git a/src/vm/frames.cpp b/src/vm/frames.cpp
index 0a2fe2c55d..fd72903376 100644
--- a/src/vm/frames.cpp
+++ b/src/vm/frames.cpp
@@ -1454,7 +1454,7 @@ struct IsObjRefProtectedScanContext : public ScanContext
     }
 };
 
-void IsObjRefProtected (Object** ppObj, ScanContext* sc, DWORD)
+void IsObjRefProtected (Object** ppObj, ScanContext* sc, uint32_t)
 {
     LIMITED_METHOD_CONTRACT;
     IsObjRefProtectedScanContext * orefProtectedSc = (IsObjRefProtectedScanContext *)sc;
diff --git a/src/vm/gcenv.cpp b/src/vm/gcenv.cpp
index 7ed4328a1f..5188e424e8 100644
--- a/src/vm/gcenv.cpp
+++ b/src/vm/gcenv.cpp
@@ -50,7 +50,7 @@ void GCToEEInterface::RestartEE(BOOL bFinishedGC)
  * GC enumeration callback
  */
 
-void GcEnumObject(LPVOID pData, OBJECTREF *pObj, DWORD flags)
+void GcEnumObject(LPVOID pData, OBJECTREF *pObj, uint32_t flags)
 {
     Object ** ppObj = (Object **)pObj;
     GCCONTEXT   * pCtx  = (GCCONTEXT *) pData;
diff --git a/src/vm/gcenv.h b/src/vm/gcenv.h
index 5816d0259e..507c8d740f 100644
--- a/src/vm/gcenv.h
+++ b/src/vm/gcenv.h
@@ -49,7 +49,7 @@
 struct ScanContext;
 class CrawlFrame;
 
-typedef void promote_func(PTR_PTR_Object, ScanContext*, DWORD);
+typedef void promote_func(PTR_PTR_Object, ScanContext*, uint32_t);
 
 typedef struct
 {
diff --git a/src/vm/perfdefaults.cpp b/src/vm/perfdefaults.cpp
index ee16e2df06..fe50d3b5fa 100644
--- a/src/vm/perfdefaults.cpp
+++ b/src/vm/perfdefaults.cpp
@@ -27,7 +27,7 @@
 PerformanceDefaults::PerformanceScenario PerformanceDefaults::s_Scenario = Uninitialized;
 
 // See use in code:PerformanceDefaults:InitializeForScenario
-extern LONG g_bLowMemoryFromHost;
+extern int32_t g_bLowMemoryFromHost;
 
 
 //
diff --git a/src/vm/proftoeeinterfaceimpl.cpp b/src/vm/proftoeeinterfaceimpl.cpp
index 0b2ebe56f6..0c6e31d482 100644
--- a/src/vm/proftoeeinterfaceimpl.cpp
+++ b/src/vm/proftoeeinterfaceimpl.cpp
@@ -1250,7 +1250,7 @@ BOOL AllocByClassHelper(Object * pBO, void * pv)
 //                to COR_PRF_GC_ROOT_FLAGS.
 //
 
-void ScanRootsHelper(Object** ppObject, ScanContext *pSC, DWORD dwFlags)
+void ScanRootsHelper(Object** ppObject, ScanContext *pSC, uint32_t dwFlags)
 {
     CONTRACTL
     {
diff --git a/src/vm/siginfo.cpp b/src/vm/siginfo.cpp
index ec023e9d0b..0567b539b3 100644
--- a/src/vm/siginfo.cpp
+++ b/src/vm/siginfo.cpp
@@ -4922,7 +4922,7 @@ BOOL MetaSig::CompareMethodConstraints(const Substitution *pSubst1,
 void PromoteCarefully(promote_func   fn, 
                       PTR_PTR_Object ppObj, 
                       ScanContext*   sc, 
-                      DWORD          flags /* = GC_CALL_INTERIOR*/ )
+                      uint32_t       flags /* = GC_CALL_INTERIOR*/ )
 {
     LIMITED_METHOD_CONTRACT;
 
diff --git a/src/vm/siginfo.hpp b/src/vm/siginfo.hpp
index 586802b1b1..c2f15ef285 100644
--- a/src/vm/siginfo.hpp
+++ b/src/vm/siginfo.hpp
@@ -70,13 +70,13 @@ enum VarKind
 //---------------------------------------------------------------------------------------
 
 struct ScanContext;
-typedef void promote_func(PTR_PTR_Object, ScanContext*, DWORD);
-typedef void promote_carefully_func(promote_func*, PTR_PTR_Object, ScanContext*, DWORD);
+typedef void promote_func(PTR_PTR_Object, ScanContext*, uint32_t);
+typedef void promote_carefully_func(promote_func*, PTR_PTR_Object, ScanContext*, uint32_t);
 
 void PromoteCarefully(promote_func   fn,
                       PTR_PTR_Object obj, 
                       ScanContext*   sc, 
-                      DWORD          flags = GC_CALL_INTERIOR);
+                      uint32_t       flags = GC_CALL_INTERIOR);
 
 class LoaderAllocator;
 void GcReportLoaderAllocator(promote_func* fn, ScanContext* sc, LoaderAllocator *pLoaderAllocator);