summaryrefslogtreecommitdiff
path: root/src/debug
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug')
-rw-r--r--src/debug/daccess/dacdbiimpl.cpp6
-rw-r--r--src/debug/daccess/dacfn.cpp4
-rw-r--r--src/debug/daccess/inspect.cpp10
-rw-r--r--src/debug/daccess/nidump.cpp166
-rw-r--r--src/debug/daccess/request.cpp12
-rw-r--r--src/debug/ee/debugger.cpp3
-rw-r--r--src/debug/ee/frameinfo.cpp23
-rw-r--r--src/debug/ee/funceval.cpp3
8 files changed, 0 insertions, 227 deletions
diff --git a/src/debug/daccess/dacdbiimpl.cpp b/src/debug/daccess/dacdbiimpl.cpp
index 957ab68205..c6c71a28ff 100644
--- a/src/debug/daccess/dacdbiimpl.cpp
+++ b/src/debug/daccess/dacdbiimpl.cpp
@@ -3246,12 +3246,6 @@ CORDB_ADDRESS DacDbiInterfaceImpl::GetThreadOrContextStaticAddress(VMPTR_FieldDe
{
fieldAddress = pRuntimeThread->GetStaticFieldAddrNoCreate(pFieldDesc, NULL);
}
-#ifdef FEATURE_REMOTING
- else if (pFieldDesc->IsContextStatic())
- {
- fieldAddress = PTR_TO_TADDR(pRuntimeThread->GetContext()->GetStaticFieldAddrNoCreate(pFieldDesc));
- }
-#endif
else
{
// In case we have more special cases added later, this will allow us to notice the need to
diff --git a/src/debug/daccess/dacfn.cpp b/src/debug/daccess/dacfn.cpp
index 33dfa10b54..3d729ba371 100644
--- a/src/debug/daccess/dacfn.cpp
+++ b/src/debug/daccess/dacfn.cpp
@@ -16,10 +16,6 @@
#ifdef FEATURE_PREJIT
#include "compile.h"
#endif // FEATURE_PREJIT
-#ifdef FEATURE_REMOTING
-#include <remoting.h>
-#include "objectclone.h"
-#endif
#include <virtualcallstub.h>
#include "peimagelayout.inl"
diff --git a/src/debug/daccess/inspect.cpp b/src/debug/daccess/inspect.cpp
index 5276626dcb..a69cfa3835 100644
--- a/src/debug/daccess/inspect.cpp
+++ b/src/debug/daccess/inspect.cpp
@@ -166,9 +166,6 @@ GetTypeFieldValueFlags(TypeHandle typeHandle,
otherFlags |= CLRDATA_VALUE_FROM_TASK_LOCAL;
}
else
-#ifdef FEATURE_REMOTING
- if (!fieldDesc->IsContextStatic())
-#endif
{
otherFlags |= CLRDATA_VALUE_FROM_INSTANCE;
}
@@ -1436,13 +1433,6 @@ ClrDataValue::NewFromFieldDesc(ClrDataAccess* dac,
baseAddr =
TO_CDADDR(tlsThread->GetStaticFieldAddrNoCreate(fieldDesc, NULL));
}
-#ifdef FEATURE_REMOTING
- else if (fieldDesc->IsContextStatic())
- {
- // XXX Microsoft - Microsoft says Context is going away.
- return E_NOTIMPL;
- }
-#endif
else if (fieldDesc->IsStatic())
{
baseAddr = TO_CDADDR
diff --git a/src/debug/daccess/nidump.cpp b/src/debug/daccess/nidump.cpp
index 3ba3d9778c..b2663fe367 100644
--- a/src/debug/daccess/nidump.cpp
+++ b/src/debug/daccess/nidump.cpp
@@ -24,9 +24,6 @@
#include <pedecoder.h>
-#ifdef FEATURE_REMOTING
-#include <crossdomaincalls.h>
-#endif
#include <mdfileformat.h>
@@ -5545,9 +5542,6 @@ NativeImageDumper::EnumMnemonics s_MTFlagsLow[] =
MTFLAG_ENTRY(GenericsMask_GenericInst),
MTFLAG_ENTRY(GenericsMask_SharedInst),
MTFLAG_ENTRY(GenericsMask_TypicalInst),
-#if defined(FEATURE_REMOTING)
- MTFLAG_ENTRY(ContextStatic),
-#endif
MTFLAG_ENTRY(HasRemotingVtsInfo),
MTFLAG_ENTRY(HasVariance),
MTFLAG_ENTRY(HasDefaultCtor),
@@ -5788,9 +5782,6 @@ static NativeImageDumper::EnumMnemonics s_VMFlags[] =
VMF_ENTRY(FIXED_ADDRESS_VT_STATICS),
VMF_ENTRY(HASLAYOUT),
VMF_ENTRY(ISNESTED),
-#ifdef FEATURE_REMOTING
- VMF_ENTRY(CANNOT_BE_BLITTED_BY_OBJECT_CLONER),
-#endif
VMF_ENTRY(IS_EQUIVALENT_TYPE),
VMF_ENTRY(HASOVERLAYEDFIELDS),
@@ -6897,12 +6888,6 @@ void NativeImageDumper::DumpFieldDesc( PTR_FieldDesc fd, const char * name )
offsetof(FieldDesc, m_dword1),
fieldsize(FieldDesc, m_dword1),
fd->m_isThreadLocal );
-#if defined(FEATURE_REMOTING)
- m_display->WriteFieldFlag( "m_isContextLocal",
- offsetof(FieldDesc, m_dword1),
- fieldsize(FieldDesc, m_dword1),
- fd->m_isContextLocal );
-#endif
m_display->WriteFieldFlag( "m_isRVA", offsetof(FieldDesc, m_dword1),
fieldsize(FieldDesc, m_dword1),
fd->m_isRVA );
@@ -6934,30 +6919,6 @@ void NativeImageDumper::DumpFieldDesc( PTR_FieldDesc fd, const char * name )
#endif
DisplayEndStructure( ALWAYS ); //name
}
-#if defined(FEATURE_REMOTING)
-NativeImageDumper::EnumMnemonics s_XADOptFlags[] =
-{
-#define XAD_ENTRY(x) NativeImageDumper::EnumMnemonics( RemotableMethodInfo:: x, W(#x) )
- XAD_ENTRY(XAD_FLAGS_INITIALIZED),
- XAD_ENTRY(XAD_NOT_OPTIMIZABLE),
- XAD_ENTRY(XAD_BLITTABLE_ARGS),
- XAD_ENTRY(XAD_BLITTABLE_RET),
-
- //this is actually the OR of the three below this. It is a "flag" so
- //it gets cleared out.
- XAD_ENTRY(XAD_RET_GC_REF),
- XAD_ENTRY(XAD_RET_FLOAT),
- XAD_ENTRY(XAD_RET_DOUBLE),
-#ifdef FEATURE_HFA
- XAD_ENTRY(XAD_RET_HFA_TYPE),
-#endif
-
- XAD_ENTRY(XAD_METHOD_IS_VIRTUAL),
- XAD_ENTRY(XAD_ARGS_HAVE_A_FLOAT),
-
-#undef XAD_ENTRY
-};
-#endif
#ifdef _PREFAST_
#pragma warning(push)
@@ -7440,133 +7401,6 @@ NativeImageDumper::DumpMethodTable( PTR_MethodTable mt, const char * name,
}
#endif // FEATURE_COMINTEROP
-#if defined(FEATURE_REMOTING)
- //RemotingVtsInfo comes after the generic dictionaries. So if I
- //don't have extents, I can't print them.
- if(haveCompleteExtents &&
- mt->HasRemotingVtsInfo()
- && CHECK_OPT(METHODTABLES)
- )
- {
- _ASSERTE(clazz == GetClassFromMT(mt));
- /* REVISIT_TODO Tue 12/13/2005
- * Is this right? is m_wNumStaticFields actually the number of static
- * fields?
- */
- unsigned numFields = (unsigned)(CountFields(mt)
- - clazz->GetNumStaticFields());
- PTR_RemotingVtsInfo vts = *mt->GetRemotingVtsInfoPtr();
- m_display->StartStructureWithOffset( "OptionalMember_RemotingVtsInfo",
- mt->GetOffsetOfOptionalMember(MethodTable::OptionalMember_RemotingVtsInfo),
- sizeof(void*),
- DPtrToPreferredAddr(vts),
- RemotingVtsInfo::GetSize(numFields)
- );
-
- DisplayStartArrayWithOffset( m_pCallbacks, W("%-30s: %s"),
- RemotingVtsInfo, ALWAYS );
- for( int i = 0; i < _countof(vts->m_pCallbacks); ++i )
- {
- PTR_MethodDesc md( vts->m_pCallbacks[i].GetValue() );
- DisplayStartElement( "Callback", ALWAYS );
- DisplayWriteElementString( "CallbackType", s_VTSCallbackNames[i],
- ALWAYS );
- if (CORCOMPILE_IS_POINTER_TAGGED(PTR_TO_TADDR(md)))
- {
- DoWriteFieldMethodDesc( "MethodDesc", UINT_MAX, UINT_MAX, md );
- }
- else
- {
- WriteElementMethodDesc( "MethodDesc", md );
- }
- DisplayEndElement( ALWAYS ); //Callback
- }
- DisplayEndArray( NULL, ALWAYS ); //m_pCallbacks
-#ifdef _DEBUG
- DisplayWriteFieldInt( m_dwNumFields, vts->m_dwNumFields,
- RemotingVtsInfo, ALWAYS );
-#endif
- /* REVISIT_TODO Tue 12/13/2005
- * Is there any reason to dump this map?
- */
- m_display->WriteFieldEmpty("m_rFieldTypes",
- offsetof(RemotingVtsInfo, m_rFieldTypes),
- RemotingVtsInfo::GetSize(numFields)
- - offsetof(RemotingVtsInfo, m_rFieldTypes) );
- DisplayEndStructure( ALWAYS ); //OptionalMember_RemotingVtsInfo
- }
-
- //RemotableMethodInfo comes after the generic dictionaries. So if I
- //don't have extents, I can't print them.
- if(haveCompleteExtents &&
- mt->HasRemotableMethodInfo() &&
- CHECK_OPT(METHODTABLES)
- )
- {
- PTR_CrossDomainOptimizationInfo cdOpt = *mt->GetRemotableMethodInfoPtr();
- if( cdOpt == NULL )
- {
- _ASSERTE(mt->GetNumVtableSlots() == 0 );
- m_display->WriteElementPointer("OptionalMember_RemotableMethodInfo",
- NULL);
- }
- else
- {
- _ASSERTE(mt->GetNumVtableSlots() > 0 );
-
- unsigned size = sizeof(RemotableMethodInfo) * mt->GetNumVtableSlots();
- //one remotable method info for each method.
- m_display->StartStructureWithOffset( "OptionalMember_RemotableMethodInfo",
- mt->GetOffsetOfOptionalMember(MethodTable::OptionalMember_RemotableMethodInfo),
- sizeof(void*),
- DPtrToPreferredAddr(cdOpt),
- size );
- m_display->StartArrayWithOffset( "m_rmi",
- offsetof(CrossDomainOptimizationInfo,
- m_rmi),
- mt->GetNumVtableSlots()
- * sizeof(RemotableMethodInfo), NULL );
- PTR_RemotableMethodInfo rmi( PTR_HOST_MEMBER_TADDR(CrossDomainOptimizationInfo, cdOpt, m_rmi) );
- for( unsigned i = 0; i < mt->GetNumVtableSlots(); ++i )
- {
- PTR_RemotableMethodInfo current = rmi + i;
- DisplayStartStructure( "RemotableMethodInfo",
- DPtrToPreferredAddr(current),
- sizeof(*current), ALWAYS );
- DisplayWriteFieldEnumerated( m_OptFlags, current->m_OptFlags,
- RemotableMethodInfo, s_XADOptFlags,
- W(", "), ALWAYS );
- DisplayEndStructure( ALWAYS ); //RemotableMethodInfo
- }
- DisplayEndArray( "Total RemotableMethodInfos", ALWAYS ); //m_rmi
- DisplayEndStructure( ALWAYS ); // OptionalMember_RemotableMethodInfo
- }
- }
-
- //ContextStatics comes after the generic dictionaries. So if I
- //don't have extents, I can't print them.
- if(haveCompleteExtents &&
- mt->HasContextStatics() &&
- CHECK_OPT(METHODTABLES)
- )
- {
- PTR_ContextStaticsBucket statics =
- *(mt->GetContextStaticsBucketPtr());
- m_display->StartStructureWithOffset( "OptionalMember_ContextStatics",
- mt->GetOffsetOfOptionalMember(MethodTable::OptionalMember_ContextStatics),
- sizeof(void*),
- DPtrToPreferredAddr(statics),
- sizeof(*statics) );
-
-#define HANDLE_FIELD(field) \
- DisplayWriteFieldInt( field, statics->field, \
- ContextStaticsBucket, ALWAYS )
- HANDLE_FIELD(m_dwContextStaticsOffset);
- HANDLE_FIELD(m_wContextStaticsSize);
-#undef HANDLE_FIELD
- DisplayEndStructure( ALWAYS ); //OptionalMember_ContextStatics
- }
-#endif
DisplayEndStructure( METHODTABLES ); //MethodTable
} // NativeImageDumper::DumpMethodTable
#ifdef _PREFAST_
diff --git a/src/debug/daccess/request.cpp b/src/debug/daccess/request.cpp
index 1f90c5e428..5c0f021f70 100644
--- a/src/debug/daccess/request.cpp
+++ b/src/debug/daccess/request.cpp
@@ -1801,11 +1801,7 @@ ClrDataAccess::GetFieldDescData(CLRDATA_ADDRESS addr, struct DacpFieldDescData *
FieldDescData->MTOfEnclosingClass = HOST_CDADDR(pFieldDesc->GetApproxEnclosingMethodTable());
FieldDescData->dwOffset = pFieldDesc->GetOffset();
FieldDescData->bIsThreadLocal = pFieldDesc->IsThreadStatic();
-#ifdef FEATURE_REMOTING
- FieldDescData->bIsContextLocal = pFieldDesc->IsContextStatic();;
-#else
FieldDescData->bIsContextLocal = FALSE;
-#endif
FieldDescData->bIsStatic = pFieldDesc->IsStatic();
FieldDescData->NextField = HOST_CDADDR(PTR_FieldDesc(PTR_HOST_TO_TADDR(pFieldDesc) + sizeof(FieldDesc)));
@@ -1835,16 +1831,8 @@ ClrDataAccess::GetMethodTableFieldData(CLRDATA_ADDRESS mt, struct DacpMethodTabl
data->FirstField = PTR_TO_TADDR(pMT->GetClass()->GetFieldDescList());
-#ifdef FEATURE_REMOTING
- BOOL hasContextStatics = pMT->HasContextStatics();
-
- data->wContextStaticsSize = (hasContextStatics) ? pMT->GetContextStaticsSize() : 0;
- _ASSERTE(!hasContextStatics || FitsIn<WORD>(pMT->GetContextStaticsOffset()));
- data->wContextStaticOffset = (hasContextStatics) ? static_cast<WORD>(pMT->GetContextStaticsOffset()) : 0;
-#else
data->wContextStaticsSize = 0;
data->wContextStaticOffset = 0;
-#endif
}
SOSDacLeave();
diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp
index df2e9a444e..b19ae9a6a6 100644
--- a/src/debug/ee/debugger.cpp
+++ b/src/debug/ee/debugger.cpp
@@ -18,9 +18,6 @@
#include "eeconfig.h" // This is here even for retail & free builds...
#include "../../dlls/mscorrc/resource.h"
-#ifdef FEATURE_REMOTING
-#include "remoting.h"
-#endif
#include "context.h"
#include "vars.hpp"
diff --git a/src/debug/ee/frameinfo.cpp b/src/debug/ee/frameinfo.cpp
index 35e5bb9a09..fb9ea886bf 100644
--- a/src/debug/ee/frameinfo.cpp
+++ b/src/debug/ee/frameinfo.cpp
@@ -1778,29 +1778,6 @@ StackWalkAction DebuggerWalkStackProc(CrawlFrame *pCF, void *data)
}
break;
-#ifdef FEATURE_REMOTING
- case Frame::TYPE_TP_METHOD_FRAME:
- LOG((LF_CORDB, LL_INFO100000, "DWSP: Frame type is TYPE_TP_METHOD_FRAME.\n"));
- if (d->ShouldIgnoreNonmethodFrames())
- {
- // Transparant Proxies push a frame onto the stack that they
- // use to figure out where they're really going; this frame
- // doesn't actually contain any code, although it does have
- // enough info into fooling our routines into thinking it does:
- // Just ignore these.
- LOG((LF_CORDB, LL_INFO100000, "DWSP: Skipping frame 0x%x b/c it's "
- "a transparant proxy frame!\n", frame));
- use = false;
- }
- else
- {
- // Otherwise do the same thing as for internal frames
- LOG((LF_CORDB, LL_INFO100000, "DWSP: NOT Skipping frame 0x%x even though it's "
- "a transparant proxy frame!\n", frame));
- INTERNAL_FRAME_ACTION(d, use);
- }
- break;
-#endif
default:
_ASSERTE(!"Invalid frame type!");
break;
diff --git a/src/debug/ee/funceval.cpp b/src/debug/ee/funceval.cpp
index eb8950deab..dcfe5a5dcf 100644
--- a/src/debug/ee/funceval.cpp
+++ b/src/debug/ee/funceval.cpp
@@ -21,9 +21,6 @@
#include "eeconfig.h" // This is here even for retail & free builds...
#include "../../dlls/mscorrc/resource.h"
-#ifdef FEATURE_REMOTING
-#include "remoting.h"
-#endif
#include "context.h"
#include "vars.hpp"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 22:20:47 +0000