From 5d989f064b0aa4ec0add96a25e6a6ca9cd4a2ace Mon Sep 17 00:00:00 2001
From: Nikos Mavrogeorgis <mavrogeorgis.nikos@gmail.com>
Date: Sat, 8 Feb 2025 19:02:30 +0100
Subject: [PATCH] [recode] Account for spilled values of four bytes

Currently, the `recode` functionality assumes that a `live_value` that
is not an alloca should have a default size of 8 bytes. However, we have
encountered cases, like in the Unifico-compiled `loop` example, where a
spilled value can be of size 4.  Thus, we extend the rewrite functions
`_get_val` and `_put_val`, to account for this case as well.
---
 criu-3.15/lib/py/st_reg_transform.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/criu-3.15/lib/py/st_reg_transform.py b/criu-3.15/lib/py/st_reg_transform.py
index 31d0dd5..37f5743 100644
--- a/criu-3.15/lib/py/st_reg_transform.py
+++ b/criu-3.15/lib/py/st_reg_transform.py
@@ -271,7 +271,12 @@ def _get_val(ctx, val, arch=False, return_loc = False):
                         raw_val.append(struct.unpack(
                             '<Q', ctx.pages.read(8))[0])
             else:
-                raw_val = struct.unpack('<Q', ctx.pages.read(8))[0]
+                if val.size == 4:
+                    raw_val = struct.unpack('<I', ctx.pages.read(4))[0]
+                elif val.size == 8:
+                    raw_val = struct.unpack('<Q', ctx.pages.read(8))[0]
+                else:
+                    raise Exception("Size not supported for spilled value!")
         else:
             raw_val = struct.unpack('<Q', ctx.pages.read(8))[0]
         if return_loc:
@@ -398,7 +403,12 @@ def _put_val(dest_ctx, dest_val, raw_val, arch=False, return_loc = False, fixup_
                     for i in range(write_count):
                         write_val.append(struct.pack("Q", raw_val[i]))
             else:
-                write_val.append(struct.pack("Q", raw_val))
+                if dest_val.size == 4:
+                    write_val.append(struct.pack("I", raw_val))
+                elif dest_val.size == 8:
+                    write_val.append(struct.pack("Q", raw_val))
+                else:
+                    raise Exception("Size not supported for spilled value!")
         else:
             if dest_val.operand_size == 1:
                 write_val.append(struct.pack("B", raw_val))