ci: run testsuite python2 transpilation

.github/workflows/internal-testsuite.yml

@@ -96,8 +96,11 @@ jobs:
         sudo apt-get -qq install    \
             build-essential         \
             libbrotli-dev           \
+            libbz2-dev              \
             libclang-${{ matrix.clang-version }}-dev \
+            libdb-dev               \
             libgcrypt20             \
+            libgdbm-dev             \
             libreadline-dev         \
             libidn2-dev             \
             libldap2-dev            \
@@ -111,6 +114,8 @@ jobs:
             python3-setuptools      \
             python3-wheel           \
             rcs                     \
+            tcl-dev                 \
+            tk-dev                  \
             zlib1g-dev
 
     # installs intercept-build to $HOME/.local/bin
@@ -130,7 +135,7 @@ jobs:
         find testsuite -type f -name compile_commands.json -delete
         export PATH=$PWD/target/release:$HOME/.local/bin:$PATH
         echo "PATH=$PATH"
-        python3 testsuite/test.py curl json-c lua nginx zstd libxml2
+        python3 testsuite/test.py curl json-c lua nginx zstd libxml2 python2
 
     - uses: actions/upload-artifact@v4
       with:

c2rust-transpile/src/translator/assembly.rs

@@ -559,6 +559,7 @@ fn tied_output_operand_idx(
 /// {0:y} (and wrapping mem-only references in square brackets).
 fn rewrite_asm<F: Fn(&str) -> bool, M: Fn(usize) -> usize>(
     asm: &str,
+    att_syntax: bool,
     input_op_mapper: M,
     is_mem_only: F,
     arch: Arch,
@@ -647,7 +648,10 @@ fn rewrite_asm<F: Fn(&str) -> bool, M: Fn(usize) -> usize>(
             }
             let mem_only = is_mem_only(index_str);
             // Push the reference wrapped in {}, or in [{}] if mem-only
-            out.push_str(if mem_only { "[{" } else { "{" });
+            if mem_only {
+                out.push(if att_syntax { '(' } else { '[' });
+            };
+            out.push('{');
             let idx: usize = index_str
                 .parse()
                 .map_err(|_| TranslationError::generic("could not parse operand idx"))?;
@@ -656,7 +660,10 @@ fn rewrite_asm<F: Fn(&str) -> bool, M: Fn(usize) -> usize>(
                 out.push(':');
                 out.push_str(&new_modifiers);
             }
-            out.push_str(if mem_only { "}]" } else { "}" });
+            out.push('}');
+            if mem_only {
+                out.push(if att_syntax { ')' } else { ']' });
+            };
             // Push the rest of the chunk
             out.push_str(&chunk[end_idx..]);
             continue;
@@ -832,6 +839,7 @@ impl<'c> Translation<'c> {
         // Rewrite arg references in assembly template
         let rewritten_asm = rewrite_asm(
             asm,
+            att_syntax,
             |idx: usize| {
                 new_idx_for_orig(tied_output_operand_idx(idx, outputs.len(), &tied_operands))
             },

c2rust-transpile/tests/snapshots/snapshots__transpile-x86_64@vm_x86.c.snap

@@ -58,7 +58,7 @@ pub unsafe extern "C" fn VM_CallCompiled(
     *opStack = 0 as core::ffi::c_int;
     opStackOfs = 0 as core::ffi::c_int;
     asm!(
-        "movq [{2}], %rax\n", "movq [{0}], %r8\n", "movq [{1}], %r9\n", "push %r15\n",
+        "movq ({2}), %rax\n", "movq ({0}), %r8\n", "movq ({1}), %r9\n", "push %r15\n",
         "push %r14\n", "push %r13\n", "push %r12\n", "callq *%rax\n", "pop %r12\n",
         "pop %r13\n", "pop %r14\n", "pop %r15\n", "\n", "mov {restmp0:x}, %bx\n", in
         (reg) & (* vm).instructionPointers, in (reg) & (* vm).dataBase, in (reg) &