From a3e6245821e84b2faaa9bf0dd57829ad21055d6b Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 31 Oct 2016 16:31:29 -0400 Subject: [PATCH] [io-layer] Remove dead code --- mono/io-layer/Makefile.am | 3 -- mono/io-layer/context.c | 22 ---------- mono/io-layer/context.h | 90 -------------------------------------- mono/io-layer/uglify.h | 4 -- mono/io-layer/wapi-remap.h | 1 - mono/io-layer/wapi.h | 1 - 6 files changed, 121 deletions(-) delete mode 100644 mono/io-layer/context.c delete mode 100644 mono/io-layer/context.h diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am index dae93fe23a4..934ed07b729 100644 --- a/mono/io-layer/Makefile.am +++ b/mono/io-layer/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS = \ libwapiincludedir = $(includedir)/mono-$(API_VER)/mono/io-layer OTHER_H = \ - context.h \ error.h \ io.h \ io-trace.h \ @@ -31,8 +30,6 @@ OTHER_H = \ wapi-remap.h OTHER_SRC = \ - context.c \ - context.h \ error.c \ error.h \ io.c \ diff --git a/mono/io-layer/context.c b/mono/io-layer/context.c deleted file mode 100644 index 75155a40ac8..00000000000 --- a/mono/io-layer/context.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * context.c: Processor-specific register contexts - * - * Author: - * Dick Porter (dick@ximian.com) - * - * (C) 2002 Ximian, Inc. - */ - -#include -#include -#include - -#include "mono/io-layer/wapi.h" - -gboolean GetThreadContext(gpointer handle G_GNUC_UNUSED, WapiContext *context G_GNUC_UNUSED) -{ - return(FALSE); -} - - - diff --git a/mono/io-layer/context.h b/mono/io-layer/context.h deleted file mode 100644 index 2d0e814716c..00000000000 --- a/mono/io-layer/context.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * context.h: Processor-specific register contexts - * - * Author: - * Dick Porter (dick@ximian.com) - * - * (C) 2002 Ximian, Inc. - */ - -#ifndef _WAPI_CONTEXT_H_ -#define _WAPI_CONTEXT_H_ - -#include - -#include "mono/io-layer/wapi.h" - -/* This part is x86-specific. MSDN states that CONTEXT is defined - * also for MIPS, Alpha and PPC processors. - */ - -#define SIZE_OF_80387_REGISTERS 80 - -#define CONTEXT_i386 0x00010000 -#define CONTEXT_i486 0x00010000 - -#define CONTEXT_CONTROL (CONTEXT_i386 | 0x00000001L) -#define CONTEXT_INTEGER (CONTEXT_i386 | 0x00000002L) -#define CONTEXT_SEGMENTS (CONTEXT_i386 | 0x00000004L) -#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x00000008L) -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x00000010L) -#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x00000020L) - -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) - -#define MAXIMUM_SUPPORTED_EXTENSION 512 - -typedef struct -{ - guint32 ControlWord; - guint32 StatusWord; - guint32 TagWord; - guint32 ErrorOffset; - guint32 ErrorSelector; - guint32 DataOffset; - guint32 DataSelector; - guint8 RegisterArea[SIZE_OF_80387_REGISTERS]; - guint32 Cr0NpxState; -} WapiFloatingSaveArea; - -typedef struct -{ - guint32 ContextFlags; - guint32 Dr0; - guint32 Dr1; - guint32 Dr2; - guint32 Dr3; - guint32 Dr6; - guint32 Dr7; - - WapiFloatingSaveArea FloatSave; - - guint32 SegGs; - guint32 SegFs; - guint32 SegEs; - guint32 SegDs; - - guint32 Edi; - guint32 Esi; - guint32 Ebx; - guint32 Edx; - guint32 Ecx; - guint32 Eax; - - guint32 Ebp; - guint32 Eip; - guint32 SegCs; - guint32 EFlags; - guint32 Esp; - guint32 SegSs; - - guint8 ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; -} WapiContext; - -G_BEGIN_DECLS - -extern gboolean GetThreadContext(gpointer handle, WapiContext *context); - -G_END_DECLS - -#endif /* _WAPI_COMPEX_H_ */ diff --git a/mono/io-layer/uglify.h b/mono/io-layer/uglify.h index 09fea6b7139..ff5a53c21bd 100644 --- a/mono/io-layer/uglify.h +++ b/mono/io-layer/uglify.h @@ -62,10 +62,6 @@ typedef WapiLargeInteger LARGE_INTEGER; typedef WapiLargeInteger *PLARGE_INTEGER; typedef WapiULargeInteger ULARGE_INTEGER; typedef WapiULargeInteger *PULARGE_INTEGER; -typedef WapiFloatingSaveArea FLOATING_SAVE_AREA; -typedef WapiFloatingSaveArea *PFLOATING_SAVE_AREA; -typedef WapiContext CONTEXT; -typedef WapiContext *PCONTEXT; typedef WapiFindData WIN32_FIND_DATA; typedef WapiFindData *LPWIN32_FIND_DATA; typedef WapiFileAttributesData WIN32_FILE_ATTRIBUTE_DATA; diff --git a/mono/io-layer/wapi-remap.h b/mono/io-layer/wapi-remap.h index 783a9f1c4d4..b19465c7c68 100644 --- a/mono/io-layer/wapi-remap.h +++ b/mono/io-layer/wapi-remap.h @@ -15,7 +15,6 @@ #define GetLastError wapi_GetLastError #define SetLastError wapi_SetLastError #define TransmitFile wapi_TransmitFile -#define GetThreadContext wapi_GetThreadContext #define CloseHandle wapi_CloseHandle #define DuplicateHandle wapi_DuplicateHandle #define CreateFile wapi_CreateFile diff --git a/mono/io-layer/wapi.h b/mono/io-layer/wapi.h index 4b4b2419d3a..520bb2f7ac6 100644 --- a/mono/io-layer/wapi.h +++ b/mono/io-layer/wapi.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include -- 2.25.1