---

yaml
---
r: 3758
b: refs/heads/master
c: aa0f6f4
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7498d036935b9a7cbf651765783cbf92fa3e0f09
+refs/heads/master: aa0f6f49610962466972e659605e3c8e676ce7b5

trunk/src/lib/ptr.rs

@@ -0,0 +1,8 @@
+// Unsafe pointer utility functions.
+
+native "rust-intrinsic" mod rusti {
+    fn ptr_offset[T](*T ptr, uint count) -> *T;
+}
+
+fn offset[T](*T ptr, uint count) -> *T { ret rusti::ptr_offset(ptr, count); }
+

trunk/src/lib/std.rc

@@ -86,6 +86,7 @@ mod getopts;
 mod term;
 mod time;
 mod smallintmap;
+mod ptr;
 
 // Local Variables:
 // mode: rust;

trunk/src/rt/intrinsics/intrinsics.cpp

@@ -1,5 +1,5 @@
 // Use `clang++ -emit-llvm -S -arch i386 -O3 -I../isaac -I../uthash
-//      -I../arch/i386 -o intrinsics.ll intrinsics.cpp`
+//      -I../arch/i386 -fno-stack-protector -o intrinsics.ll intrinsics.cpp`
 
 #include "../rust_internal.h"
 
@@ -22,3 +22,10 @@ rust_intrinsic_ivec_len(rust_task *task, type_desc *ty, rust_ivec *v)
     return fill / ty->size;
 }
 
+extern "C" void *
+rust_intrinsic_ptr_offset(rust_task *task, type_desc *ty, void *ptr,
+                          uintptr_t count)
+{
+    return &((uint8_t *)ptr)[ty->size * count];
+}
+

trunk/src/rt/intrinsics/intrinsics.ll.in

@@ -4,30 +4,31 @@ target triple = "@CFG_LLVM_TRIPLE@"
 
 %0 = type { i32, i8**, i32 }
 %1 = type { i32, %struct.rust_task**, i32 }
-%2 = type { %"struct.hash_map<rust_task *, rust_handle<rust_task> *>::map_entry"* }
-%3 = type { %"struct.hash_map<rust_port *, rust_handle<rust_port> *>::map_entry"* }
-%4 = type { %"struct.hash_map<rust_dom *, rust_handle<rust_dom> *>::map_entry"* }
+%2 = type { %"struct.hash_map<rust_port *, rust_handle<rust_port> *>::map_entry"* }
+%3 = type { %"struct.hash_map<rust_scheduler *, rust_handle<rust_scheduler> *>::map_entry"* }
+%4 = type { i32, %class.rust_task_thread**, i32 }
 %5 = type { i32 (...)**, %6 }
-%6 = type { i32, %struct.rust_dom**, i32 }
-%7 = type { i32 (...)**, %8 }
-%8 = type { i32, %class.rust_message_queue**, i32 }
-%9 = type opaque
-%10 = type opaque
-%11 = type { %"struct.hash_map<rust_port *, rust_proxy<rust_port> *>::map_entry"* }
+%6 = type { i32, %class.rust_message_queue**, i32 }
+%7 = type opaque
+%8 = type opaque
+%9 = type { %"struct.hash_map<rust_task *, rust_proxy<rust_task> *>::map_entry"* }
+%10 = type { %"struct.hash_map<rust_port *, rust_proxy<rust_port> *>::map_entry"* }
 %class.array_list = type { i32, %struct.maybe_proxy**, i32 }
 %class.context = type { %struct.registers_t, %class.context* }
-%class.hash_map = type { %"struct.hash_map<rust_task *, rust_proxy<rust_task> *>::map_entry"* }
+%class.hash_map = type { %"struct.hash_map<rust_task *, rust_handle<rust_task> *>::map_entry"* }
 %class.indexed_list = type { i32 (...)**, %1 }
-%class.lock_and_signal = type { i32 (...)**, %struct._opaque_pthread_cond_t, %struct._opaque_pthread_mutex_t }
+%class.lock_and_signal = type { i32 (...)**, %struct._opaque_pthread_cond_t, %struct._opaque_pthread_mutex_t, %struct._opaque_pthread_t*, i8 }
 %class.lock_free_queue = type { i32 (...)**, %"struct.lock_free_queue<rust_message *>::pointer_t", %"struct.lock_free_queue<rust_message *>::pointer_t" }
 %class.memory_region = type { i32 (...)**, %class.rust_srv*, %class.memory_region*, i32, %0, i8, i8, %class.lock_and_signal }
-%class.rust_crate_cache = type { %struct.type_desc*, %struct.rust_dom*, i32 }
+%class.rust_crate_cache = type { %struct.type_desc*, %struct.rust_scheduler*, i32 }
 %class.rust_handle = type opaque
-%class.rust_kernel = type { %class.rust_thread, %class.memory_region*, %class.rust_log, %class.rust_srv*, %2, %3, %4, i8, %class.lock_and_signal, %5, %7 }
-%class.rust_log = type { i32 (...)**, %class.rust_srv*, %struct.rust_dom*, i8, i8 }
-%class.rust_message_queue = type { %class.lock_free_queue, %class.memory_region, %class.rust_kernel*, %10*, i32 }
-%class.rust_srv = type { i32 (...)**, %class.memory_region, %class.memory_region }
-%class.rust_task_list = type { %class.indexed_list, %struct.rust_dom*, i8* }
+%class.rust_kernel = type { %class.rust_thread, %class.memory_region*, %class.rust_log, %class.rust_srv*, %class.hash_map, %2, %3, i8, %class.lock_and_signal, %4, %struct.rust_scheduler*, %class.lock_and_signal, %5 }
+%class.rust_log = type { i32 (...)**, %class.rust_srv*, %struct.rust_scheduler*, i8, i8 }
+%class.rust_message_queue = type { %class.lock_free_queue, %class.memory_region, %class.rust_kernel*, %8*, i32 }
+%class.rust_srv = type { i32 (...)**, %class.memory_region }
+%"class.rust_task::wakeup_callback" = type { i32 (...)** }
+%class.rust_task_list = type { %class.indexed_list, %struct.rust_scheduler*, i8* }
+%class.rust_task_thread = type { %class.rust_thread, i32, %class.rust_kernel* }
 %class.rust_thread = type { i32 (...)**, i8, %struct._opaque_pthread_t* }
 %class.timer = type { i32 (...)**, i64, i64 }
 %struct.UT_hash_bucket = type { %struct.UT_hash_handle*, i32, i32 }
@@ -39,23 +40,22 @@ target triple = "@CFG_LLVM_TRIPLE@"
 %struct._opaque_pthread_mutex_t = type { i32, [40 x i8] }
 %struct._opaque_pthread_t = type { i32, %struct.__darwin_pthread_handler_rec*, [596 x i8] }
 %struct.gc_alloc = type { %struct.gc_alloc*, %struct.gc_alloc*, i32, [0 x i8] }
-%"struct.hash_map<rust_dom *, rust_handle<rust_dom> *>::map_entry" = type opaque
 %"struct.hash_map<rust_port *, rust_handle<rust_port> *>::map_entry" = type opaque
 %"struct.hash_map<rust_port *, rust_proxy<rust_port> *>::map_entry" = type opaque
+%"struct.hash_map<rust_scheduler *, rust_handle<rust_scheduler> *>::map_entry" = type opaque
 %"struct.hash_map<rust_task *, rust_handle<rust_task> *>::map_entry" = type opaque
 %"struct.hash_map<rust_task *, rust_proxy<rust_task> *>::map_entry" = type opaque
-%"struct.lock_free_queue<rust_message *>::node_t" = type { %9*, %"struct.lock_free_queue<rust_message *>::pointer_t" }
+%"struct.lock_free_queue<rust_message *>::node_t" = type { %7*, %"struct.lock_free_queue<rust_message *>::pointer_t" }
 %"struct.lock_free_queue<rust_message *>::pointer_t" = type { %"struct.lock_free_queue<rust_message *>::node_t"*, i32 }
 %struct.maybe_proxy = type { %struct.rc_base, %struct.rust_task* }
 %struct.randctx = type { i32, [256 x i32], [256 x i32], i32, i32, i32 }
 %struct.rc_base = type { i32 }
 %struct.registers_t = type { i32, i32, i32, i32, i32, i32, i32, i32, i16, i16, i16, i16, i16, i16, i32, i32 }
-%struct.rust_alarm = type { %struct.rust_task*, i32 }
 %struct.rust_cond = type { i8 }
-%struct.rust_dom = type { %struct.rc_base, i32, %class.rust_log, i32, %class.rust_srv*, %class.memory_region, %class.memory_region, i8*, %class.rust_task_list, %class.rust_task_list, %class.rust_task_list, %class.rust_task_list, %class.rust_crate_cache, %struct.randctx, %struct.rust_task*, %struct.rust_task*, i32, %class.rust_kernel*, i32, %class.hash_map, %11, %class.rust_message_queue*, %struct._opaque_pthread_attr_t }
 %struct.rust_ivec = type { i32, i32, %union.rust_ivec_payload }
 %struct.rust_ivec_heap = type { i32, [0 x i8] }
-%struct.rust_task = type { %struct.maybe_proxy, %struct.stk_seg*, i32, i32, %struct.gc_alloc*, %struct.rust_dom*, %class.rust_crate_cache*, i8*, %class.rust_task_list*, %struct.rust_cond*, i8*, %struct.rust_task*, i32, i32, i32, %class.timer, i32*, %class.array_list, %struct.rust_alarm, %class.rust_handle*, %class.context }
+%struct.rust_scheduler = type { %struct.rc_base, i32, %class.rust_log, i32, %class.rust_srv*, i8*, %class.rust_task_list, %class.rust_task_list, %class.rust_task_list, %class.rust_task_list, %class.rust_crate_cache, %struct.randctx, %struct.rust_task*, %struct.rust_task*, i32, %class.rust_kernel*, i32, %9, %10, %class.rust_message_queue*, %struct._opaque_pthread_attr_t }
+%struct.rust_task = type { %struct.maybe_proxy, %struct.stk_seg*, i32, i32, %struct.gc_alloc*, %struct.rust_scheduler*, %class.rust_crate_cache*, %class.rust_kernel*, i8*, %class.rust_task_list*, %struct.rust_cond*, i8*, %struct.rust_task*, i32, i32, i32, %class.timer, i32*, %class.array_list, %class.rust_handle*, %class.context, i32, i32, %class.memory_region, %"class.rust_task::wakeup_callback"*, %class.lock_and_signal }
 %struct.rust_vec = type { %struct.rc_base, i32, i32, i32, [0 x i8] }
 %struct.stk_seg = type { i32, i32, [0 x i8] }
 %struct.type_desc = type { %struct.type_desc**, i32, i32, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, i32, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*, i8*, i8)*, %struct.UT_hash_handle, i32, [0 x %struct.type_desc*] }
@@ -97,6 +97,15 @@ if.end17:                                         ; preds = %if.else, %entry, %i
   ret i32 %div
 }
 
+define linkonce_odr i8* @rust_intrinsic_ptr_offset(%struct.rust_task* nocapture %task, %struct.type_desc* nocapture %ty, i8* %ptr, i32 %count) nounwind readonly {
+entry:
+  %size = getelementptr inbounds %struct.type_desc* %ty, i32 0, i32 1
+  %tmp1 = load i32* %size, align 4, !tbaa !0
+  %mul = mul i32 %tmp1, %count
+  %arrayidx = getelementptr inbounds i8* %ptr, i32 %mul
+  ret i8* %arrayidx
+}
+
 !0 = metadata !{metadata !"long", metadata !1}
 !1 = metadata !{metadata !"omnipotent char", metadata !2}
 !2 = metadata !{metadata !"Simple C/C++ TBAA", null}