1 files changed, 28 insertions, 29 deletions

diff --git a/src/arch/x86/types.cc b/src/arch/x86/types.cc
index 830a131e5..a960205b5 100644
--- a/src/arch/x86/types.cc
+++ b/src/arch/x86/types.cc
@@ -36,69 +36,68 @@ using namespace std;
 
 template <>
 void
-paramOut(ostream &os, const string &name, ExtMachInst const &machInst)
+paramOut(CheckpointOut &cp, const string &name, ExtMachInst const &machInst)
 {
     // Prefixes
-    paramOut(os, name + ".legacy", (uint8_t)machInst.legacy);
-    paramOut(os, name + ".rex", (uint8_t)machInst.rex);
+    paramOut(cp, name + ".legacy", (uint8_t)machInst.legacy);
+    paramOut(cp, name + ".rex", (uint8_t)machInst.rex);
 
     // Opcode
-    paramOut(os, name + ".opcode.type", (uint8_t)machInst.opcode.type);
-    paramOut(os, name + ".opcode.op", (uint8_t)machInst.opcode.op);
+    paramOut(cp, name + ".opcode.type", (uint8_t)machInst.opcode.type);
+    paramOut(cp, name + ".opcode.op", (uint8_t)machInst.opcode.op);
 
     // Modifier bytes
-    paramOut(os, name + ".modRM", (uint8_t)machInst.modRM);
-    paramOut(os, name + ".sib", (uint8_t)machInst.sib);
+    paramOut(cp, name + ".modRM", (uint8_t)machInst.modRM);
+    paramOut(cp, name + ".sib", (uint8_t)machInst.sib);
 
     // Immediate fields
-    paramOut(os, name + ".immediate", machInst.immediate);
-    paramOut(os, name + ".displacement", machInst.displacement);
+    paramOut(cp, name + ".immediate", machInst.immediate);
+    paramOut(cp, name + ".displacement", machInst.displacement);
 
     // Sizes
-    paramOut(os, name + ".opSize", machInst.opSize);
-    paramOut(os, name + ".addrSize", machInst.addrSize);
-    paramOut(os, name + ".stackSize", machInst.stackSize);
-    paramOut(os, name + ".dispSize", machInst.dispSize);
+    paramOut(cp, name + ".opSize", machInst.opSize);
+    paramOut(cp, name + ".addrSize", machInst.addrSize);
+    paramOut(cp, name + ".stackSize", machInst.stackSize);
+    paramOut(cp, name + ".dispSize", machInst.dispSize);
 
     // Mode
-    paramOut(os, name + ".mode", (uint8_t)machInst.mode);
+    paramOut(cp, name + ".mode", (uint8_t)machInst.mode);
 }
 
 template <>
 void
-paramIn(Checkpoint *cp, const string &section,
-        const string &name, ExtMachInst &machInst)
+paramIn(CheckpointIn &cp, const string &name, ExtMachInst &machInst)
 {
     uint8_t temp8;
     // Prefixes
-    paramIn(cp, section, name + ".legacy", temp8);
+    paramIn(cp, name + ".legacy", temp8);
     machInst.legacy = temp8;
-    paramIn(cp, section, name + ".rex", temp8);
+    paramIn(cp, name + ".rex", temp8);
     machInst.rex = temp8;
 
     // Opcode
-    paramIn(cp, section, name + ".opcode.type", temp8);
+    paramIn(cp, name + ".opcode.type", temp8);
     machInst.opcode.type = (OpcodeType)temp8;
-    paramIn(cp, section, name + ".opcode.op", temp8);
+    paramIn(cp, name + ".opcode.op", temp8);
     machInst.opcode.op = temp8;
 
     // Modifier bytes
-    paramIn(cp, section, name + ".modRM", temp8);
+    paramIn(cp, name + ".modRM", temp8);
     machInst.modRM = temp8;
-    paramIn(cp, section, name + ".sib", temp8);
+    paramIn(cp, name + ".sib", temp8);
     machInst.sib = temp8;;
 
     // Immediate fields
-    paramIn(cp, section, name + ".immediate", machInst.immediate);
-    paramIn(cp, section, name + ".displacement", machInst.displacement);
+    paramIn(cp, name + ".immediate", machInst.immediate);
+    paramIn(cp, name + ".displacement", machInst.displacement);
 
     // Sizes
-    paramIn(cp, section, name + ".opSize", machInst.opSize);
-    paramIn(cp, section, name + ".addrSize", machInst.addrSize);
-    paramIn(cp, section, name + ".stackSize", machInst.stackSize);
-    paramIn(cp, section, name + ".dispSize", machInst.dispSize);
+    paramIn(cp, name + ".opSize", machInst.opSize);
+    paramIn(cp, name + ".addrSize", machInst.addrSize);
+    paramIn(cp, name + ".stackSize", machInst.stackSize);
+    paramIn(cp, name + ".dispSize", machInst.dispSize);
 
     // Mode
-    paramIn(cp, section, name + ".mode", temp8);
+    paramIn(cp, name + ".mode", temp8);
     machInst.mode = temp8;
 }