resolve merge conflicts

Ravenbrook · Jun 17, 2023 · 3af4410 · 3af4410
2 parents de19bf4 + 8b169cf
commit 3af4410
Show file tree

Hide file tree

Showing 20 changed files with 2,473 additions and 17 deletions.
diff --git a/code/comm.gmk b/code/comm.gmk
@@ -214,6 +214,7 @@ MPMCOMMON = \
     trace.c \
     traceanc.c \
     tract.c \
+    trans.c \
     tree.c \
     version.c \
     vm.c \
@@ -295,7 +296,8 @@ TEST_TARGETS=\
     teletest \
     walkt0 \
     zcoll \
-    zmess
+    zmess \
+    ztfm
 
 # This target records programs that we were once able to build but
 # can't at the moment:
@@ -576,6 +578,9 @@ $(PFM)/$(VARIETY)/zcoll: $(PFM)/$(VARIETY)/zcoll.o \
 $(PFM)/$(VARIETY)/zmess: $(PFM)/$(VARIETY)/zmess.o \
 	$(FMTDYTSTOBJ) $(TESTLIBOBJ) $(PFM)/$(VARIETY)/mps.a
 
+$(PFM)/$(VARIETY)/ztfm: $(PFM)/$(VARIETY)/ztfm.o \
+	$(FMTDYTSTOBJ) $(TESTLIBOBJ) $(PFM)/$(VARIETY)/mps.a
+
 $(PFM)/$(VARIETY)/mpseventcnv: $(PFM)/$(VARIETY)/eventcnv.o \
   $(PFM)/$(VARIETY)/mps.a
 

diff --git a/code/commpost.nmk b/code/commpost.nmk
@@ -222,9 +222,6 @@ $(PFM)\$(VARIETY)\btcv.exe: $(PFM)\$(VARIETY)\btcv.obj \
 $(PFM)\$(VARIETY)\bttest.exe: $(PFM)\$(VARIETY)\bttest.obj \
 	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
-$(PFM)\$(VARIETY)\cvmicv.exe: $(PFM)\$(VARIETY)\cvmicv.obj \
-	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
-
 $(PFM)\$(VARIETY)\djbench.exe: $(PFM)\$(VARIETY)\djbench.obj \
 	$(TESTLIBOBJ) $(TESTTHROBJ)
 

diff --git a/code/commpre.nmk b/code/commpre.nmk
@@ -100,7 +100,8 @@ TEST_TARGETS=\
     teletest.exe \
     walkt0.exe \
     zcoll.exe \
-    zmess.exe
+    zmess.exe \
+    ztfm.exe
 
 # Stand-alone programs go in EXTRA_TARGETS if they should always be
 # built, or in OPTIONAL_TARGETS if they should only be built if
@@ -171,6 +172,7 @@ MPMCOMMON=\
     [trace] \
     [traceanc] \
     [tract] \
+    [trans] \
     [tree] \
     [version] \
     [vm] \

diff --git a/code/mps.c b/code/mps.c
@@ -80,6 +80,7 @@
 #include "failover.c"
 #include "vm.c"
 #include "policy.c"
+#include "trans.c"
 
 /* Additional pool classes */
 

diff --git a/code/mps.h b/code/mps.h
@@ -851,6 +851,15 @@ extern mps_res_t _mps_fix2(mps_ss_t, mps_addr_t *);
 /* Misc interface */
 extern mps_res_t mps_addr_object(mps_addr_t *p_o, mps_arena_t arena, mps_addr_t addr);
 
+/* Transforms interface. */
+
+typedef struct mps_transform_s *mps_transform_t;
+extern mps_res_t mps_transform_create(mps_transform_t *, mps_arena_t);
+extern mps_res_t mps_transform_add_oldnew(mps_transform_t, mps_addr_t *, mps_addr_t *, size_t);
+extern mps_res_t mps_transform_apply(mps_bool_t *, mps_transform_t);
+extern void mps_transform_destroy(mps_transform_t);
+
+
 #endif /* mps_h */
 
 

diff --git a/code/mps.xcodeproj/project.pbxproj b/code/mps.xcodeproj/project.pbxproj
@@ -119,6 +119,7 @@
 				3114A6B9156E9763001E0AA3 /* PBXTargetDependency */,
 				31D60063156D3F5C00337B26 /* PBXTargetDependency */,
 				31D60087156D3FE600337B26 /* PBXTargetDependency */,
+				220FD3F419533E8F00967A35 /* PBXTargetDependency */,
 				3114A6D5156E9839001E0AA3 /* PBXTargetDependency */,
 				2265D72220E54020003019E8 /* PBXTargetDependency */,
 				2D07B9791636FCBD00DB751B /* PBXTargetDependency */,
@@ -130,6 +131,13 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		220FD3DD195339C000967A35 /* fmtdy.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC6156BE48D00753214 /* fmtdy.c */; };
+		220FD3DE195339C000967A35 /* fmtdytst.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAC7156BE48D00753214 /* fmtdytst.c */; };
+		220FD3DF195339C000967A35 /* fmthe.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CAE4156BE6D500753214 /* fmthe.c */; };
+		220FD3E1195339C000967A35 /* testlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC9E156AB73400714D05 /* testlib.c */; };
+		220FD3E3195339C000967A35 /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; };
+		220FD3F119533E7200967A35 /* fmtno.c in Sources */ = {isa = PBXBuildFile; fileRef = 3124CACC156BE4C200753214 /* fmtno.c */; };
+		220FD3F219533E7900967A35 /* ztfm.c in Sources */ = {isa = PBXBuildFile; fileRef = 220FD3F019533C3200967A35 /* ztfm.c */; };
 		2215A9C9192A495F00E9E2CE /* pooln.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FACEDE18880933000FDBC1 /* pooln.c */; };
 		2231BB5118CA97D8002D6322 /* testlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 31EEAC9E156AB73400714D05 /* testlib.c */; };
 		2231BB5318CA97D8002D6322 /* libmps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31EEABFB156AAF9D00714D05 /* libmps.a */; };
@@ -344,6 +352,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		220FD3DA195339C000967A35 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 31EEABFA156AAF9D00714D05;
+			remoteInfo = mps;
+		};
+		220FD3F319533E8F00967A35 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 220FD3D8195339C000967A35;
+			remoteInfo = ztfm;
+		};
 		2215A9AB192A47BB00E9E2CE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
@@ -1033,6 +1055,15 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		220FD3E4195339C000967A35 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
 		2231BB5418CA97D8002D6322 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1479,6 +1510,12 @@
 /* Begin PBXFileReference section */
 		2213454C1DB0386600E14202 /* prmc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prmc.h; sourceTree = "<group>"; };
 		2213454D1DB038D400E14202 /* prmcxc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = prmcxc.c; sourceTree = "<group>"; };
+		220FD3E9195339C000967A35 /* ztfm */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ztfm; sourceTree = BUILT_PRODUCTS_DIR; };
+		220FD3EA195339E500967A35 /* mpsitr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpsitr.c; sourceTree = "<group>"; };
+		220FD3EB195339F000967A35 /* trans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = trans.c; sourceTree = "<group>"; };
+		220FD3ED19533A8700967A35 /* mpscvm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpscvm.h; sourceTree = "<group>"; };
+		220FD3EE19533A8700967A35 /* trans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trans.h; sourceTree = "<group>"; };
+		220FD3F019533C3200967A35 /* ztfm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ztfm.c; sourceTree = "<group>"; };
 		2231BB5918CA97D8002D6322 /* locbwcss */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = locbwcss; sourceTree = BUILT_PRODUCTS_DIR; };
 		2231BB6718CA97DC002D6322 /* locusss */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = locusss; sourceTree = BUILT_PRODUCTS_DIR; };
 		2231BB6818CA9834002D6322 /* locbwcss.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = locbwcss.c; sourceTree = "<group>"; };
@@ -1796,6 +1833,14 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		220FD3E2195339C000967A35 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				220FD3E3195339C000967A35 /* libmps.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		2231BB5218CA97D8002D6322 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -2375,6 +2420,7 @@
 				3114A6BA156E9768001E0AA3 /* walkt0.c */,
 				31D6005E156D3F4A00337B26 /* zcoll.c */,
 				31D6007B156D3FCC00337B26 /* zmess.c */,
+				220FD3F019533C3200967A35 /* ztfm.c */,
 			);
 			name = Tests;
 			sourceTree = "<group>";
@@ -2467,6 +2513,8 @@
 				22EA3F4520D2B0D90065F5B6 /* forktest */,
 				2265D71D20E53F9C003019E8 /* mpseventpy */,
 				319F7A142A30D08500E5B418 /* addrobj */,
+				220FD3E9195339C000967A35 /* ztfm */,
+
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -2521,7 +2569,9 @@
 				311F2F6517398B3B00C15B6A /* mpsacl.h */,
 				311F2F6617398B3B00C15B6A /* mpsavm.h */,
 				22FACEDB188808D5000FDBC1 /* mpscmfs.h */,
+				220FD3ED19533A8700967A35 /* mpscvm.h */,
 				31EEABF5156AAF7C00714D05 /* mpsi.c */,
+				220FD3EA195339E500967A35 /* mpsitr.c */,
 				311F2F6717398B3B00C15B6A /* mpsio.h */,
 				311F2F6817398B3B00C15B6A /* mpslib.h */,
 				311F2F6917398B3B00C15B6A /* mpstd.h */,
@@ -2565,6 +2615,8 @@
 				31EEAC1F156AB2B200714D05 /* traceanc.c */,
 				31EEAC0D156AB27B00714D05 /* tract.c */,
 				311F2F7A17398B8E00C15B6A /* tract.h */,
+				220FD3EB195339F000967A35 /* trans.c */,
+				220FD3EE19533A8700967A35 /* trans.h */,
 				310F5D7118B6675F007EFCBC /* tree.c */,
 				310F5D7218B6675F007EFCBC /* tree.h */,
 				31EEAC44156AB32500714D05 /* version.c */,
@@ -2649,6 +2701,24 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
+		220FD3D8195339C000967A35 /* ztfm */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 220FD3E5195339C000967A35 /* Build configuration list for PBXNativeTarget "ztfm" */;
+			buildPhases = (
+				220FD3DB195339C000967A35 /* Sources */,
+				220FD3E2195339C000967A35 /* Frameworks */,
+				220FD3E4195339C000967A35 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				220FD3D9195339C000967A35 /* PBXTargetDependency */,
+			);
+			name = ztfm;
+			productName = zmess;
+			productReference = 220FD3E9195339C000967A35 /* ztfm */;
+			productType = "com.apple.product-type.tool";
+		};
 		2231BB4C18CA97D8002D6322 /* locbwcss */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2231BB5518CA97D8002D6322 /* Build configuration list for PBXNativeTarget "locbwcss" */;
@@ -3611,6 +3681,7 @@
 				3114A6AB156E9759001E0AA3 /* walkt0 */,
 				31D60053156D3F3500337B26 /* zcoll */,
 				31D60070156D3FBC00337B26 /* zmess */,
+				220FD3D8195339C000967A35 /* ztfm */,
 				3114A6C5156E9815001E0AA3 /* mpseventcnv */,
 				2265D71120E53F9C003019E8 /* mpseventpy */,
 				2D07B9701636FC9900DB751B /* mpseventsql */,
@@ -3697,6 +3768,19 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		220FD3DB195339C000967A35 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				220FD3F219533E7900967A35 /* ztfm.c in Sources */,
+				220FD3DD195339C000967A35 /* fmtdy.c in Sources */,
+				220FD3DE195339C000967A35 /* fmtdytst.c in Sources */,
+				220FD3DF195339C000967A35 /* fmthe.c in Sources */,
+				220FD3F119533E7200967A35 /* fmtno.c in Sources */,
+				220FD3E1195339C000967A35 /* testlib.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		2231BB4F18CA97D8002D6322 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -4216,6 +4300,16 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		220FD3D9195339C000967A35 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 31EEABFA156AAF9D00714D05 /* mps */;
+			targetProxy = 220FD3DA195339C000967A35 /* PBXContainerItemProxy */;
+		};
+		220FD3F419533E8F00967A35 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 220FD3D8195339C000967A35 /* ztfm */;
+			targetProxy = 220FD3F319533E8F00967A35 /* PBXContainerItemProxy */;
+		};
 		2215A9AA192A47BB00E9E2CE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 3104AFF1156D37A0000A585A /* all */;
@@ -4709,6 +4803,27 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+		220FD3E6195339C000967A35 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		220FD3E7195339C000967A35 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		220FD3E8195339C000967A35 /* RASH */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = RASH;
+		};
 		2215A9AE192A47BB00E9E2CE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -6096,6 +6211,16 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		220FD3E5195339C000967A35 /* Build configuration list for PBXNativeTarget "ztfm" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				220FD3E6195339C000967A35 /* Debug */,
+				220FD3E7195339C000967A35 /* Release */,
+				220FD3E8195339C000967A35 /* RASH */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		2215A9AD192A47BB00E9E2CE /* Build configuration list for PBXAggregateTarget "testci" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (