Skip to content

Commit 73f4724

Browse files
brsonbrson
committed
---
yaml --- r: 6361 b: refs/heads/master c: 6a0e85b h: refs/heads/master i: 6359: 16de792 v: v3
1 parent 519a927 commit 73f4724

File tree

4 files changed

+1
-190
lines changed

4 files changed

+1
-190
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 5e7dff4db5700c58f2fcc2add7311dd561cdf135
2+
refs/heads/master: 6a0e85b81c428e1f364a521c1187179347356091

‎trunk/src/rt/intrinsics/intrinsics.cpp

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -80,68 +80,3 @@ rust_intrinsic_task_sleep(void **retptr,
8080
rust_task_sleep(time_in_us);
8181
}
8282

83-
84-
extern "C" void
85-
rust_intrinsic_2_vec_len(size_t *retptr,
86-
void *env,
87-
type_desc *ty,
88-
rust_vec **vp)
89-
{
90-
*retptr = (*vp)->fill / ty->size;
91-
}
92-
93-
extern "C" void
94-
rust_intrinsic_2_ptr_offset(void **retptr,
95-
void *env,
96-
type_desc *ty,
97-
void *ptr,
98-
uintptr_t count)
99-
{
100-
*retptr = &((uint8_t *)ptr)[ty->size * count];
101-
}
102-
103-
extern "C" void
104-
rust_intrinsic_2_cast(void *retptr,
105-
void *env,
106-
type_desc *t1,
107-
type_desc *t2,
108-
void *src)
109-
{
110-
if (t1->size != t2->size) {
111-
upcall_fail("attempt to cast values of differing sizes",
112-
__FILE__, __LINE__);
113-
return;
114-
}
115-
116-
memmove(retptr, src, t1->size);
117-
}
118-
119-
extern "C" void
120-
rust_intrinsic_2_addr_of(void **retptr,
121-
void *env,
122-
type_desc *ty,
123-
void *valptr) {
124-
*retptr = valptr;
125-
}
126-
127-
extern "C" void
128-
rust_intrinsic_2_recv(void **retptr,
129-
void *env,
130-
type_desc *ty,
131-
rust_port *port) {
132-
port_recv((uintptr_t*)retptr, port);
133-
}
134-
135-
extern "C" void
136-
rust_intrinsic_2_get_type_desc(void **retptr,
137-
void *env,
138-
type_desc* ty) {
139-
*(type_desc**)retptr = ty;
140-
}
141-
142-
extern "C" void
143-
rust_intrinsic_2_task_sleep(void **retptr,
144-
void *env,
145-
size_t time_in_us) {
146-
rust_task_sleep(time_in_us);
147-
}

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

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -130,68 +130,6 @@ define void @rust_intrinsic_task_sleep(i8** nocapture %retptr, i8* nocapture %en
130130

131131
declare void @rust_task_sleep(i32)
132132

133-
define void @rust_intrinsic_2_vec_len(i32* nocapture %retptr, i8* nocapture %env, %struct.type_desc* nocapture %ty, %struct.rust_vec** nocapture %vp) nounwind {
134-
%1 = load %struct.rust_vec** %vp, align 4, !tbaa !0
135-
%2 = getelementptr inbounds %struct.rust_vec* %1, i32 0, i32 0
136-
%3 = load i32* %2, align 4, !tbaa !3
137-
%4 = getelementptr inbounds %struct.type_desc* %ty, i32 0, i32 1
138-
%5 = load i32* %4, align 4, !tbaa !3
139-
%6 = udiv i32 %3, %5
140-
store i32 %6, i32* %retptr, align 4, !tbaa !3
141-
ret void
142-
}
143-
144-
define void @rust_intrinsic_2_ptr_offset(i8** nocapture %retptr, i8* nocapture %env, %struct.type_desc* nocapture %ty, i8* %ptr, i32 %count) nounwind {
145-
%1 = getelementptr inbounds %struct.type_desc* %ty, i32 0, i32 1
146-
%2 = load i32* %1, align 4, !tbaa !3
147-
%3 = mul i32 %2, %count
148-
%4 = getelementptr inbounds i8* %ptr, i32 %3
149-
store i8* %4, i8** %retptr, align 4, !tbaa !0
150-
ret void
151-
}
152-
153-
define void @rust_intrinsic_2_cast(i8* nocapture %retptr, i8* nocapture %env, %struct.type_desc* nocapture %t1, %struct.type_desc* nocapture %t2, i8* nocapture %src) {
154-
%1 = getelementptr inbounds %struct.type_desc* %t1, i32 0, i32 1
155-
%2 = load i32* %1, align 4, !tbaa !3
156-
%3 = getelementptr inbounds %struct.type_desc* %t2, i32 0, i32 1
157-
%4 = load i32* %3, align 4, !tbaa !3
158-
%5 = icmp eq i32 %2, %4
159-
br i1 %5, label %7, label %6
160-
161-
; <label>:6 ; preds = %0
162-
tail call void @upcall_fail(i8* getelementptr inbounds ([42 x i8]* @.str, i32 0, i32 0), i8* getelementptr inbounds ([33 x i8]* @.str1, i32 0, i32 0), i32 112)
163-
br label %8
164-
165-
; <label>:7 ; preds = %0
166-
tail call void @llvm.memmove.p0i8.p0i8.i32(i8* %retptr, i8* %src, i32 %2, i32 1, i1 false)
167-
br label %8
168-
169-
; <label>:8 ; preds = %7, %6
170-
ret void
171-
}
172-
173-
define void @rust_intrinsic_2_addr_of(i8** nocapture %retptr, i8* nocapture %env, %struct.type_desc* nocapture %ty, i8* %valptr) nounwind {
174-
store i8* %valptr, i8** %retptr, align 4, !tbaa !0
175-
ret void
176-
}
177-
178-
define void @rust_intrinsic_2_recv(i8** %retptr, i8* nocapture %env, %struct.type_desc* nocapture %ty, %class.rust_port* %port) {
179-
%1 = bitcast i8** %retptr to i32*
180-
tail call void @port_recv(i32* %1, %class.rust_port* %port)
181-
ret void
182-
}
183-
184-
define void @rust_intrinsic_2_get_type_desc(i8** nocapture %retptr, i8* nocapture %env, %struct.type_desc* %ty) nounwind {
185-
%ty.c = bitcast %struct.type_desc* %ty to i8*
186-
store i8* %ty.c, i8** %retptr, align 4, !tbaa !0
187-
ret void
188-
}
189-
190-
define void @rust_intrinsic_2_task_sleep(i8** nocapture %retptr, i8* nocapture %env, i32 %time_in_us) {
191-
tail call void @rust_task_sleep(i32 %time_in_us)
192-
ret void
193-
}
194-
195133
!0 = metadata !{metadata !"any pointer", metadata !1}
196134
!1 = metadata !{metadata !"omnipotent char", metadata !2}
197135
!2 = metadata !{metadata !"Simple C/C++ TBAA", null}

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

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -130,68 +130,6 @@ define void @rust_intrinsic_task_sleep(i8** nocapture %retptr, i8* nocapture %en
130130

131131
declare void @rust_task_sleep(i64)
132132

133-
define void @rust_intrinsic_2_vec_len(i64* nocapture %retptr, i8* nocapture %env, %struct.type_desc* nocapture %ty, %struct.rust_vec** nocapture %vp) nounwind uwtable {
134-
%1 = load %struct.rust_vec** %vp, align 8, !tbaa !0
135-
%2 = getelementptr inbounds %struct.rust_vec* %1, i64 0, i32 0
136-
%3 = load i64* %2, align 8, !tbaa !3
137-
%4 = getelementptr inbounds %struct.type_desc* %ty, i64 0, i32 1
138-
%5 = load i64* %4, align 8, !tbaa !3
139-
%6 = udiv i64 %3, %5
140-
store i64 %6, i64* %retptr, align 8, !tbaa !3
141-
ret void
142-
}
143-
144-
define void @rust_intrinsic_2_ptr_offset(i8** nocapture %retptr, i8* nocapture %env, %struct.type_desc* nocapture %ty, i8* %ptr, i64 %count) nounwind uwtable {
145-
%1 = getelementptr inbounds %struct.type_desc* %ty, i64 0, i32 1
146-
%2 = load i64* %1, align 8, !tbaa !3
147-
%3 = mul i64 %2, %count
148-
%4 = getelementptr inbounds i8* %ptr, i64 %3
149-
store i8* %4, i8** %retptr, align 8, !tbaa !0
150-
ret void
151-
}
152-
153-
define void @rust_intrinsic_2_cast(i8* nocapture %retptr, i8* nocapture %env, %struct.type_desc* nocapture %t1, %struct.type_desc* nocapture %t2, i8* nocapture %src) uwtable {
154-
%1 = getelementptr inbounds %struct.type_desc* %t1, i64 0, i32 1
155-
%2 = load i64* %1, align 8, !tbaa !3
156-
%3 = getelementptr inbounds %struct.type_desc* %t2, i64 0, i32 1
157-
%4 = load i64* %3, align 8, !tbaa !3
158-
%5 = icmp eq i64 %2, %4
159-
br i1 %5, label %7, label %6
160-
161-
; <label>:6 ; preds = %0
162-
tail call void @upcall_fail(i8* getelementptr inbounds ([42 x i8]* @.str, i64 0, i64 0), i8* getelementptr inbounds ([33 x i8]* @.str1, i64 0, i64 0), i64 112)
163-
br label %8
164-
165-
; <label>:7 ; preds = %0
166-
tail call void @llvm.memmove.p0i8.p0i8.i64(i8* %retptr, i8* %src, i64 %2, i32 1, i1 false)
167-
br label %8
168-
169-
; <label>:8 ; preds = %7, %6
170-
ret void
171-
}
172-
173-
define void @rust_intrinsic_2_addr_of(i8** nocapture %retptr, i8* nocapture %env, %struct.type_desc* nocapture %ty, i8* %valptr) nounwind uwtable {
174-
store i8* %valptr, i8** %retptr, align 8, !tbaa !0
175-
ret void
176-
}
177-
178-
define void @rust_intrinsic_2_recv(i8** %retptr, i8* nocapture %env, %struct.type_desc* nocapture %ty, %class.rust_port* %port) uwtable {
179-
%1 = bitcast i8** %retptr to i64*
180-
tail call void @port_recv(i64* %1, %class.rust_port* %port)
181-
ret void
182-
}
183-
184-
define void @rust_intrinsic_2_get_type_desc(i8** nocapture %retptr, i8* nocapture %env, %struct.type_desc* %ty) nounwind uwtable {
185-
%ty.c = bitcast %struct.type_desc* %ty to i8*
186-
store i8* %ty.c, i8** %retptr, align 8, !tbaa !0
187-
ret void
188-
}
189-
190-
define void @rust_intrinsic_2_task_sleep(i8** nocapture %retptr, i8* nocapture %env, i64 %time_in_us) uwtable {
191-
tail call void @rust_task_sleep(i64 %time_in_us)
192-
ret void
193-
}
194-
195133
!0 = metadata !{metadata !"any pointer", metadata !1}
196134
!1 = metadata !{metadata !"omnipotent char", metadata !2}
197135
!2 = metadata !{metadata !"Simple C/C++ TBAA", null}

0 commit comments

Comments
 (0)