From 880b97bfb1612e92c592cce89cfe7e765ea04005 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 11 Jul 2018 17:09:07 +0100 Subject: [PATCH] There is now no difference between the sets of sources for compilers mv and pc, so eliminate the duplication. Copied from Perforce Change: 194602 --- mps/code/mps.c | 80 ++++++++++++++++---------------------------------- 1 file changed, 26 insertions(+), 54 deletions(-) diff --git a/mps/code/mps.c b/mps/code/mps.c index 4da75456b7f..26fc3d63b5a 100644 --- a/mps/code/mps.c +++ b/mps/code/mps.c @@ -111,7 +111,7 @@ #include "prmcanan.c" /* generic architecture mutator context */ #include "span.c" /* generic stack probe */ -/* macOS on 32-bit Intel built with Clang or GCC */ +/* macOS on IA-32 built with Clang or GCC */ #elif defined(MPS_PF_XCI3LL) || defined(MPS_PF_XCI3GC) @@ -120,12 +120,12 @@ #include "vmix.c" /* Posix virtual memory */ #include "protix.c" /* Posix protection */ #include "protxc.c" /* macOS Mach exception handling */ -#include "prmci3.c" /* 32-bit Intel mutator context decoding */ +#include "prmci3.c" /* IA-32 mutator context */ #include "prmcxc.c" /* macOS mutator context */ -#include "prmcxci3.c" /* 32-bit Intel for macOS mutator context */ +#include "prmcxci3.c" /* IA-32 for macOS mutator context */ #include "span.c" /* generic stack probe */ -/* macOS on 64-bit Intel build with Clang or GCC */ +/* macOS on x86-64 build with Clang or GCC */ #elif defined(MPS_PF_XCI6LL) || defined(MPS_PF_XCI6GC) @@ -134,12 +134,12 @@ #include "vmix.c" /* Posix virtual memory */ #include "protix.c" /* Posix protection */ #include "protxc.c" /* macOS Mach exception handling */ -#include "prmci6.c" /* 64-bit Intel mutator context decoding */ +#include "prmci6.c" /* x86-64 mutator context */ #include "prmcxc.c" /* macOS mutator context */ -#include "prmcxci6.c" /* 64-bit Intel for macOS mutator context */ +#include "prmcxci6.c" /* x86-64 for macOS mutator context */ #include "span.c" /* generic stack probe */ -/* FreeBSD on 32-bit Intel built with GCC or Clang */ +/* FreeBSD on IA-32 built with GCC or Clang */ #elif defined(MPS_PF_FRI3GC) || defined(MPS_PF_FRI3LL) @@ -151,10 +151,10 @@ #include "protsgix.c" /* Posix signal handling */ #include "prmcanan.c" /* generic architecture mutator context */ #include "prmcix.c" /* Posix mutator context */ -#include "prmcfri3.c" /* 32-bit Intel for FreeBSD mutator context */ +#include "prmcfri3.c" /* IA-32 for FreeBSD mutator context */ #include "span.c" /* generic stack probe */ -/* FreeBSD on 64-bit Intel built with GCC or Clang */ +/* FreeBSD on x86-64 built with GCC or Clang */ #elif defined(MPS_PF_FRI6GC) || defined(MPS_PF_FRI6LL) @@ -166,10 +166,10 @@ #include "protsgix.c" /* Posix signal handling */ #include "prmcanan.c" /* generic architecture mutator context */ #include "prmcix.c" /* Posix mutator context */ -#include "prmcfri6.c" /* 64-bit Intel for FreeBSD mutator context */ +#include "prmcfri6.c" /* x86-64 for FreeBSD mutator context */ #include "span.c" /* generic stack probe */ -/* Linux on 32-bit Intel with GCC */ +/* Linux on IA-32 with GCC */ #elif defined(MPS_PF_LII3GC) @@ -179,12 +179,12 @@ #include "vmix.c" /* Posix virtual memory */ #include "protix.c" /* Posix protection */ #include "protsgix.c" /* Posix signal handling */ -#include "prmci3.c" /* 32-bit Intel mutator context */ +#include "prmci3.c" /* IA-32 mutator context */ #include "prmcix.c" /* Posix mutator context */ -#include "prmclii3.c" /* 32-bit Intel for Linux mutator context */ +#include "prmclii3.c" /* IA-32 for Linux mutator context */ #include "span.c" /* generic stack probe */ -/* Linux on 64-bit Intel with GCC or Clang */ +/* Linux on x86-64 with GCC or Clang */ #elif defined(MPS_PF_LII6GC) || defined(MPS_PF_LII6LL) @@ -194,65 +194,37 @@ #include "vmix.c" /* Posix virtual memory */ #include "protix.c" /* Posix protection */ #include "protsgix.c" /* Posix signal handling */ -#include "prmci6.c" /* 64-bit Intel mutator context */ +#include "prmci6.c" /* x86-64 mutator context */ #include "prmcix.c" /* Posix mutator context */ -#include "prmclii6.c" /* 64-bit Intel for Linux mutator context */ +#include "prmclii6.c" /* x86-64 for Linux mutator context */ #include "span.c" /* generic stack probe */ -/* Windows on 32-bit Intel with Microsoft Visual Studio */ +/* Windows on IA-32 with Microsoft Visual Studio or Pelles C */ -#elif defined(MPS_PF_W3I3MV) +#elif defined(MPS_PF_W3I3MV) || defined(MPS_PF_W3I3PC) #include "lockw3.c" /* Windows locks */ #include "thw3.c" /* Windows threading */ #include "vmw3.c" /* Windows virtual memory */ #include "protw3.c" /* Windows protection */ -#include "prmci3.c" /* 32-bit Intel mutator context decoding */ +#include "prmci3.c" /* IA-32 mutator context */ #include "prmcw3.c" /* Windows mutator context */ -#include "prmcw3i3.c" /* Windows on 32-bit Intel mutator context */ -#include "spw3i3.c" /* Windows on 32-bit Intel stack probe */ +#include "prmcw3i3.c" /* Windows on IA-32 mutator context */ +#include "spw3i3.c" /* Windows on IA-32 stack probe */ #include "mpsiw3.c" /* Windows interface layer extras */ -/* Windows on 64-bit Intel with Microsoft Visual Studio */ +/* Windows on x86-64 with Microsoft Visual Studio or Pelles C */ -#elif defined(MPS_PF_W3I6MV) +#elif defined(MPS_PF_W3I6MV) || defined(MPS_PF_W3I6PC) #include "lockw3.c" /* Windows locks */ #include "thw3.c" /* Windows threading */ #include "vmw3.c" /* Windows virtual memory */ #include "protw3.c" /* Windows protection */ -#include "prmci6.c" /* 64-bit Intel mutator context decoding */ +#include "prmci6.c" /* x86-64 mutator context */ #include "prmcw3.c" /* Windows mutator context */ -#include "prmcw3i6.c" /* Windows on 64-bit Intel mutator context */ -#include "spw3i6.c" /* Windows on 64-bit Intel stack probe */ -#include "mpsiw3.c" /* Windows interface layer extras */ - -/* Windows on 32-bit Intel with Pelles C */ - -#elif defined(MPS_PF_W3I3PC) - -#include "lockw3.c" /* Windows locks */ -#include "thw3.c" /* Windows threading */ -#include "vmw3.c" /* Windows virtual memory */ -#include "protw3.c" /* Windows protection */ -#include "prmci3.c" /* 32-bit Intel mutator context decoding */ -#include "prmcw3.c" /* Windows mutator context */ -#include "prmcw3i3.c" /* Windows on 32-bit Intel mutator context */ -#include "spw3i3.c" /* 32-bit Intel stack probe */ -#include "mpsiw3.c" /* Windows interface layer extras */ - -/* Windows on 64-bit Intel with Pelles C */ - -#elif defined(MPS_PF_W3I6PC) - -#include "lockw3.c" /* Windows locks */ -#include "thw3.c" /* Windows threading */ -#include "vmw3.c" /* Windows virtual memory */ -#include "protw3.c" /* Windows protection */ -#include "prmci6.c" /* 64-bit Intel mutator context decoding */ -#include "prmcw3.c" /* Windows mutator context */ -#include "prmcw3i6.c" /* Windows on 64-bit Intel mutator context */ -#include "spw3i6.c" /* 64-bit Intel stack probe */ +#include "prmcw3i6.c" /* Windows on x86-64 mutator context */ +#include "spw3i6.c" /* Windows on x86-64 stack probe */ #include "mpsiw3.c" /* Windows interface layer extras */ #else