about summary refs log tree commit diff
path: root/src/libcore/rt
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-04-17 18:45:58 -0700
committerbors <bors@rust-lang.org>2013-04-17 18:45:58 -0700
commitfdb4ef321ed5eee681c2b723dcb157c280aa72f2 (patch)
tree7f38fcabd13cba2ff4577b32360abe43720490fc /src/libcore/rt
parent68dea752967fa2c7e0c4b82f476086457c93fff7 (diff)
parenta5ddc009829bef149a9e2f127e80609589604443 (diff)
downloadrust-fdb4ef321ed5eee681c2b723dcb157c280aa72f2.tar.gz
rust-fdb4ef321ed5eee681c2b723dcb157c280aa72f2.zip
auto merge of #5726 : brson/rust/struct-return, r=brson
r? @nikomatsakis

This doesn't completely fix the x86 ABI for structs, but it does fix some cases. On linux, structs appear to be returned correctly now. On windows, structs are only returned by pointer when they are greater than 8 bytes. That scenario works now.

In the case where the struct is less than 8 bytes our generated code looks peculiar. When returning a pair of u16, C packs both variables into %eax to return them. Our generated code though expects to find one of the pair in %ax and the other in %dx. Similar for u8. I haven't looked into it yet.

There appears to also be struct passing problems on linux, where my `extern-pass-TwoU8s` and `extern-pass-TwoU16s` tests are failing.
Diffstat (limited to 'src/libcore/rt')
-rw-r--r--src/libcore/rt/uv/net.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libcore/rt/uv/net.rs b/src/libcore/rt/uv/net.rs
index 29ea36cd88b..4b9ff4504dd 100644
--- a/src/libcore/rt/uv/net.rs
+++ b/src/libcore/rt/uv/net.rs
@@ -356,7 +356,6 @@ impl NativeHandle<*uvll::uv_write_t> for WriteRequest {
 
 
 #[test]
-#[ignore(reason = "ffi struct issues")]
 fn connect_close() {
     do run_in_bare_thread() {
         let mut loop_ = Loop::new();
@@ -409,7 +408,6 @@ fn connect_read() {
 }
 
 #[test]
-#[ignore(reason = "ffi struct issues")]
 fn listen() {
     do run_in_bare_thread() {
         static MAX: int = 10;