aboutsummaryrefslogtreecommitdiffstats
path: root/mps/code/proti3.c
diff options
context:
space:
mode:
authorRichard Brooksby2001-12-05 15:48:24 +0000
committerRichard Brooksby2001-12-05 15:48:24 +0000
commit492dd3c684e53bd42b28371bdaaa99ad67ebd835 (patch)
tree59a2df0f685b93b44fbc03847b76782275308aaf /mps/code/proti3.c
parent25c78993edd7b4a607eba951b6ab2a9a51c55b62 (diff)
downloademacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.tar.gz
emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.zip
Merging changes from union to masters. this incorporates pekka's updates: tuning and a type in amcsshe.c and some adding some missing checks in arenavm.c. it also brings our cope of their hopenames up to date.
Copied from Perforce Change: 24815 ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code/proti3.c')
-rw-r--r--mps/code/proti3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mps/code/proti3.c b/mps/code/proti3.c
index 1056ec5a96e..7eed2dcbf75 100644
--- a/mps/code/proti3.c
+++ b/mps/code/proti3.c
@@ -1,6 +1,6 @@
1/* impl.c.proti3: PROTECTION MUTATOR CONTEXT (INTEL 386) 1/* impl.c.proti3: PROTECTION MUTATOR CONTEXT (INTEL 386)
2 * 2 *
3 * $HopeName: MMsrc!proti3.c(trunk.1) $ 3 * $HopeName: MMsrc!proti3.c(trunk.2) $
4 * Copyright (C) 1999 Harlequin Limited. All rights reserved. 4 * Copyright (C) 1999 Harlequin Limited. All rights reserved.
5 * 5 *
6 * .design: See design.mps.prot for the generic design of the interface 6 * .design: See design.mps.prot for the generic design of the interface
@@ -52,7 +52,7 @@
52#include "mpm.h" 52#include "mpm.h"
53#include "prmci3.h" 53#include "prmci3.h"
54 54
55SRCID(proti3, "$HopeName$"); 55SRCID(proti3, "$HopeName: MMsrc!proti3.c(trunk.2) $");
56 56
57 57
58/* DecodeCB -- Decode an Intel x86 control byte into Hi, Medium & Low fields */ 58/* DecodeCB -- Decode an Intel x86 control byte into Hi, Medium & Low fields */