summaryrefslogtreecommitdiff
path: root/src/pal
diff options
context:
space:
mode:
authorJonghyun Park <parjong@gmail.com>2016-11-26 00:07:16 +0900
committerJan Kotas <jkotas@microsoft.com>2016-11-25 07:07:16 -0800
commit1ce314b3f7b51081f88835e60f8516780f4894ac (patch)
tree396237e18bf057299ea0baabde8e880d690d0b26 /src/pal
parentc958ed15c1a58224966b10a6c778d13aaf537469 (diff)
downloadcoreclr-1ce314b3f7b51081f88835e60f8516780f4894ac.tar.gz
coreclr-1ce314b3f7b51081f88835e60f8516780f4894ac.tar.bz2
coreclr-1ce314b3f7b51081f88835e60f8516780f4894ac.zip
[x86/Linux] Renames i386 as amd64 in arch (PAL) (#8307)
The files in src/pal/src/arch/i386 are actually for amd64 (not x86). This commit renames the directory name as the first step towards enabling PAL in x86/Linux.
Diffstat (limited to 'src/pal')
-rw-r--r--src/pal/src/CMakeLists.txt16
-rw-r--r--src/pal/src/arch/amd64/activationhandlerwrapper.S (renamed from src/pal/src/arch/i386/activationhandlerwrapper.S)0
-rw-r--r--src/pal/src/arch/amd64/asmconstants.h (renamed from src/pal/src/arch/i386/asmconstants.h)0
-rw-r--r--src/pal/src/arch/amd64/context.S (renamed from src/pal/src/arch/i386/context.S)0
-rw-r--r--src/pal/src/arch/amd64/context2.S (renamed from src/pal/src/arch/i386/context2.S)0
-rw-r--r--src/pal/src/arch/amd64/debugbreak.S (renamed from src/pal/src/arch/i386/debugbreak.S)0
-rw-r--r--src/pal/src/arch/amd64/dispatchexceptionwrapper.S (renamed from src/pal/src/arch/i386/dispatchexceptionwrapper.S)0
-rw-r--r--src/pal/src/arch/amd64/exceptionhelper.S (renamed from src/pal/src/arch/i386/exceptionhelper.S)0
-rw-r--r--src/pal/src/arch/amd64/optimizedtls.cpp (renamed from src/pal/src/arch/i386/optimizedtls.cpp)2
-rw-r--r--src/pal/src/arch/amd64/processor.cpp (renamed from src/pal/src/arch/i386/processor.cpp)0
-rw-r--r--src/pal/src/arch/arm/exceptionhelper.S2
11 files changed, 10 insertions, 10 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt
index a51fe93523..89eac35273 100644
--- a/src/pal/src/CMakeLists.txt
+++ b/src/pal/src/CMakeLists.txt
@@ -42,9 +42,9 @@ endif()
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
add_definitions(-D_TARGET_MAC64)
set(PLATFORM_SOURCES
- arch/i386/activationhandlerwrapper.S
- arch/i386/context.S
- arch/i386/dispatchexceptionwrapper.S
+ arch/amd64/activationhandlerwrapper.S
+ arch/amd64/context.S
+ arch/amd64/dispatchexceptionwrapper.S
exception/machexception.cpp
exception/machmessage.cpp
)
@@ -85,10 +85,10 @@ add_compile_options(-fPIC)
if(PAL_CMAKE_PLATFORM_ARCH_AMD64)
set(ARCH_SOURCES
- arch/i386/context2.S
- arch/i386/debugbreak.S
- arch/i386/exceptionhelper.S
- arch/i386/processor.cpp
+ arch/amd64/context2.S
+ arch/amd64/debugbreak.S
+ arch/amd64/exceptionhelper.S
+ arch/amd64/processor.cpp
)
elseif(PAL_CMAKE_PLATFORM_ARCH_ARM)
set(ARCH_SOURCES
@@ -109,7 +109,7 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_I386)
#arch/i386/context2.S
#arch/i386/debugbreak.S
#arch/i386/exceptionhelper.S
- arch/i386/processor.cpp
+ arch/amd64/processor.cpp
)
endif()
diff --git a/src/pal/src/arch/i386/activationhandlerwrapper.S b/src/pal/src/arch/amd64/activationhandlerwrapper.S
index 63f718e81f..63f718e81f 100644
--- a/src/pal/src/arch/i386/activationhandlerwrapper.S
+++ b/src/pal/src/arch/amd64/activationhandlerwrapper.S
diff --git a/src/pal/src/arch/i386/asmconstants.h b/src/pal/src/arch/amd64/asmconstants.h
index 182c1191e4..182c1191e4 100644
--- a/src/pal/src/arch/i386/asmconstants.h
+++ b/src/pal/src/arch/amd64/asmconstants.h
diff --git a/src/pal/src/arch/i386/context.S b/src/pal/src/arch/amd64/context.S
index f8a2dca89c..f8a2dca89c 100644
--- a/src/pal/src/arch/i386/context.S
+++ b/src/pal/src/arch/amd64/context.S
diff --git a/src/pal/src/arch/i386/context2.S b/src/pal/src/arch/amd64/context2.S
index 0e93e81a55..0e93e81a55 100644
--- a/src/pal/src/arch/i386/context2.S
+++ b/src/pal/src/arch/amd64/context2.S
diff --git a/src/pal/src/arch/i386/debugbreak.S b/src/pal/src/arch/amd64/debugbreak.S
index 3065e4064c..3065e4064c 100644
--- a/src/pal/src/arch/i386/debugbreak.S
+++ b/src/pal/src/arch/amd64/debugbreak.S
diff --git a/src/pal/src/arch/i386/dispatchexceptionwrapper.S b/src/pal/src/arch/amd64/dispatchexceptionwrapper.S
index ee5ff468d6..ee5ff468d6 100644
--- a/src/pal/src/arch/i386/dispatchexceptionwrapper.S
+++ b/src/pal/src/arch/amd64/dispatchexceptionwrapper.S
diff --git a/src/pal/src/arch/i386/exceptionhelper.S b/src/pal/src/arch/amd64/exceptionhelper.S
index b7b34ace41..b7b34ace41 100644
--- a/src/pal/src/arch/i386/exceptionhelper.S
+++ b/src/pal/src/arch/amd64/exceptionhelper.S
diff --git a/src/pal/src/arch/i386/optimizedtls.cpp b/src/pal/src/arch/amd64/optimizedtls.cpp
index 910a6eb931..cd89db6b0a 100644
--- a/src/pal/src/arch/i386/optimizedtls.cpp
+++ b/src/pal/src/arch/amd64/optimizedtls.cpp
@@ -79,7 +79,7 @@ CorUnix::TLSMakeOptimizedGetter(
}
// Need to preserve %ecx, %edx, and %esi registers as specified in
- // GetThreadGeneric(void) in vm/i386/asmhelpers.s
+ // GetThreadGeneric(void) in vm/amd64/asmhelpers.s
p[i++] = 0x51; // push %ecx
p[i++] = 0x52; // push %edx
p[i++] = 0x89; // mov %esp,%eax // %eax = sp;
diff --git a/src/pal/src/arch/i386/processor.cpp b/src/pal/src/arch/amd64/processor.cpp
index 4fd3a4abc8..4fd3a4abc8 100644
--- a/src/pal/src/arch/i386/processor.cpp
+++ b/src/pal/src/arch/amd64/processor.cpp
diff --git a/src/pal/src/arch/arm/exceptionhelper.S b/src/pal/src/arch/arm/exceptionhelper.S
index ed1c9c3dc2..76cdcba9b4 100644
--- a/src/pal/src/arch/arm/exceptionhelper.S
+++ b/src/pal/src/arch/arm/exceptionhelper.S
@@ -10,7 +10,7 @@
// EXTERN_C void ThrowExceptionFromContextInternal(CONTEXT* context, PAL_SEHException* ex);
LEAF_ENTRY ThrowExceptionFromContextInternal, _TEXT
- // Ported from src/pal/src/arch/i386/exceptionhelper.S
+ // Ported from src/pal/src/arch/amd64/exceptionhelper.S
push_nonvol_reg {r7} /* FP. x64-RBP */
ldr r4, [r0, #(CONTEXT_R4)]