From ee1b2fa3eae3790ae57140afa54f39a6f89e150c Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Tue, 31 Jan 2017 21:53:37 +0000
Subject: [PATCH] compiler: swap the order of ptr/len fields in lists.

This is to make them match the Rust slices.
Once the cslice crate becomes #![no_std] we'll also use its (tidier)
conversion functions.
---
 artiq/compiler/transforms/llvm_ir_generator.py | 18 +++++++++---------
 artiq/firmware/libksupport/lib.rs              |  4 ++--
 artiq/firmware/runtime/rpc_proto.rs            |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py
index 71e61e58b..706afbadc 100644
--- a/artiq/compiler/transforms/llvm_ir_generator.py
+++ b/artiq/compiler/transforms/llvm_ir_generator.py
@@ -220,7 +220,7 @@ class LLVMIRGenerator:
             return llptr
         elif builtins.is_listish(typ):
             lleltty = self.llty_of_type(builtins.get_iterable_elt(typ))
-            return ll.LiteralStructType([lli32, lleltty.as_pointer()])
+            return ll.LiteralStructType([lleltty.as_pointer(), lli32])
         elif builtins.is_range(typ):
             lleltty = self.llty_of_type(builtins.get_iterable_elt(typ))
             return ll.LiteralStructType([lleltty, lleltty, lleltty])
@@ -621,11 +621,11 @@ class LLVMIRGenerator:
             return llvalue
         elif builtins.is_listish(insn.type):
             llsize = self.map(insn.operands[0])
+            lleltty = self.llty_of_type(builtins.get_iterable_elt(insn.type))
+            llalloc = self.llbuilder.alloca(lleltty, size=llsize)
             llvalue = ll.Constant(self.llty_of_type(insn.type), ll.Undefined)
-            llvalue = self.llbuilder.insert_value(llvalue, llsize, 0)
-            llalloc = self.llbuilder.alloca(self.llty_of_type(builtins.get_iterable_elt(insn.type)),
-                                            size=llsize)
-            llvalue = self.llbuilder.insert_value(llvalue, llalloc, 1, name=insn.name)
+            llvalue = self.llbuilder.insert_value(llvalue, llalloc, 0, name=insn.name)
+            llvalue = self.llbuilder.insert_value(llvalue, llsize, 1)
             return llvalue
         elif not builtins.is_allocated(insn.type) or ir.is_keyword(insn.type):
             llvalue = ll.Constant(self.llty_of_type(insn.type), ll.Undefined)
@@ -833,7 +833,7 @@ class LLVMIRGenerator:
             llelt = self.llbuilder.gep(lllst, [llidx], inbounds=True)
             llvalue = self.llbuilder.load(llelt)
         else:
-            llelts = self.llbuilder.extract_value(lllst, 1)
+            llelts = self.llbuilder.extract_value(lllst, 0)
             llelt = self.llbuilder.gep(llelts, [llidx], inbounds=True)
             llvalue = self.llbuilder.load(llelt)
         if isinstance(llvalue.type, ll.PointerType):
@@ -846,7 +846,7 @@ class LLVMIRGenerator:
         if builtins.is_str(lst.type):
             llelt = self.llbuilder.gep(lllst, [llidx], inbounds=True)
         else:
-            llelts = self.llbuilder.extract_value(lllst, 1)
+            llelts = self.llbuilder.extract_value(lllst, 0)
             llelt = self.llbuilder.gep(llelts, [llidx], inbounds=True)
         return self.llbuilder.store(self.map(insn.value()), llelt)
 
@@ -1069,7 +1069,7 @@ class LLVMIRGenerator:
             if builtins.is_str(collection.type):
                 return self.llbuilder.call(self.llbuiltin("strlen"), [self.map(collection)])
             else:
-                return self.llbuilder.extract_value(self.map(collection), 0)
+                return self.llbuilder.extract_value(self.map(collection), 1)
         elif insn.op in ("printf", "rtio_log"):
             # We only get integers, floats, pointers and strings here.
             llargs = map(self.map, insn.operands)
@@ -1463,7 +1463,7 @@ class LLVMIRGenerator:
             llglobal.linkage = "private"
 
             lleltsptr = llglobal.bitcast(lleltsary.type.element.as_pointer())
-            llconst   = ll.Constant(llty, [ll.Constant(lli32, len(llelts)), lleltsptr])
+            llconst   = ll.Constant(llty, [lleltsptr, ll.Constant(lli32, len(llelts))])
             return llconst
         elif types.is_rpc(typ) or types.is_c_function(typ):
             # RPC and C functions have no runtime representation.
diff --git a/artiq/firmware/libksupport/lib.rs b/artiq/firmware/libksupport/lib.rs
index d4a56c2b0..6ca5afd66 100644
--- a/artiq/firmware/libksupport/lib.rs
+++ b/artiq/firmware/libksupport/lib.rs
@@ -101,8 +101,8 @@ pub extern fn panic_fmt(args: core::fmt::Arguments, file: &'static str, line: u3
 
 #[repr(C)]
 pub struct ArtiqList<T> {
-    len: usize,
-    ptr: *const T
+    ptr: *const T,
+    len: usize
 }
 
 impl<T> ArtiqList<T> {
diff --git a/artiq/firmware/runtime/rpc_proto.rs b/artiq/firmware/runtime/rpc_proto.rs
index d302d389d..7eb3598f7 100644
--- a/artiq/firmware/runtime/rpc_proto.rs
+++ b/artiq/firmware/runtime/rpc_proto.rs
@@ -47,7 +47,7 @@ unsafe fn recv_value(reader: &mut Read, tag: Tag, data: &mut *mut (),
             Ok(())
         }
         Tag::List(it) | Tag::Array(it) => {
-            struct List { length: u32, elements: *mut () };
+            struct List { elements: *mut (), length: u32 };
             consume_value!(List, |ptr| {
                 (*ptr).length = try!(read_u32(reader));
 
@@ -126,7 +126,7 @@ unsafe fn send_value(writer: &mut Write, tag: Tag, data: &mut *const ()) -> io::
             Ok(())
         }
         Tag::List(it) | Tag::Array(it) => {
-            struct List { length: u32, elements: *const () };
+            struct List { elements: *const (), length: u32 };
             consume_value!(List, |ptr| {
                 try!(write_u32(writer, (*ptr).length));
                 let tag = it.clone().next().expect("truncated tag");