-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #36024 - japaric:mips64, r=alexcrichton
add mips64-gnu and mips64el-gnu targets With this commit one can build no_core (and probably no_std as well) Rust programs for these targets. It's not yet possible to cross compile std for these targets because rust-lang/libc doesn't know about the mips64 architecture. These targets have been tested by cross compiling the "smallest hello" program (see code below) and then running it under QEMU. ``` rust extern { fn puts(_: *const u8); } fn start(_: isize, _: *const *const u8) -> isize { unsafe { let msg = b"Hello, world!\0"; puts(msg as *const _ as *const u8); } 0 } trait Copy {} trait Sized {} ``` cc #36015 r? @alexcrichton cc @brson The cabi stuff is likely wrong. I just copied cabi_mips source and changed some `4`s to `8`s and `32`s to `64`s. It was enough to get libc's `puts` to work but I'd like someone familiar with this module to check it.
- Loading branch information
Showing
16 changed files
with
259 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
# rustbuild-only target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
# rustbuild-only target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule liblibc
updated
48 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
use target::{Target, TargetOptions, TargetResult}; | ||
|
||
pub fn target() -> TargetResult { | ||
Ok(Target { | ||
llvm_target: "mips64-unknown-linux-gnuabi64".to_string(), | ||
target_endian: "big".to_string(), | ||
target_pointer_width: "64".to_string(), | ||
data_layout: "E-m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(), | ||
arch: "mips64".to_string(), | ||
target_os: "linux".to_string(), | ||
target_env: "gnu".to_string(), | ||
target_vendor: "unknown".to_string(), | ||
options: TargetOptions { | ||
// NOTE(mips64r2) matches C toolchain | ||
cpu: "mips64r2".to_string(), | ||
features: "+mips64r2".to_string(), | ||
max_atomic_width: 64, | ||
..super::linux_base::opts() | ||
}, | ||
}) | ||
} |
31 changes: 31 additions & 0 deletions
31
src/librustc_back/target/mips64el_unknown_linux_gnuabi64.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
use target::{Target, TargetOptions, TargetResult}; | ||
|
||
pub fn target() -> TargetResult { | ||
Ok(Target { | ||
llvm_target: "mips64el-unknown-linux-gnuabi64".to_string(), | ||
target_endian: "little".to_string(), | ||
target_pointer_width: "64".to_string(), | ||
data_layout: "e-m:m-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(), | ||
arch: "mips64".to_string(), | ||
target_os: "linux".to_string(), | ||
target_env: "gnu".to_string(), | ||
target_vendor: "unknown".to_string(), | ||
options: TargetOptions { | ||
// NOTE(mips64r2) matches C toolchain | ||
cpu: "mips64r2".to_string(), | ||
features: "+mips64r2".to_string(), | ||
max_atomic_width: 64, | ||
..super::linux_base::opts() | ||
}, | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,168 @@ | ||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
#![allow(non_upper_case_globals)] | ||
|
||
use libc::c_uint; | ||
use std::cmp; | ||
use llvm; | ||
use llvm::{Integer, Pointer, Float, Double, Struct, Array, Vector}; | ||
use abi::{ArgType, FnType}; | ||
use context::CrateContext; | ||
use type_::Type; | ||
|
||
fn align_up_to(off: usize, a: usize) -> usize { | ||
return (off + a - 1) / a * a; | ||
} | ||
|
||
fn align(off: usize, ty: Type) -> usize { | ||
let a = ty_align(ty); | ||
return align_up_to(off, a); | ||
} | ||
|
||
fn ty_align(ty: Type) -> usize { | ||
match ty.kind() { | ||
Integer => ((ty.int_width() as usize) + 7) / 8, | ||
Pointer => 8, | ||
Float => 4, | ||
Double => 8, | ||
Struct => { | ||
if ty.is_packed() { | ||
1 | ||
} else { | ||
let str_tys = ty.field_types(); | ||
str_tys.iter().fold(1, |a, t| cmp::max(a, ty_align(*t))) | ||
} | ||
} | ||
Array => { | ||
let elt = ty.element_type(); | ||
ty_align(elt) | ||
} | ||
Vector => { | ||
let len = ty.vector_length(); | ||
let elt = ty.element_type(); | ||
ty_align(elt) * len | ||
} | ||
_ => bug!("ty_align: unhandled type") | ||
} | ||
} | ||
|
||
fn ty_size(ty: Type) -> usize { | ||
match ty.kind() { | ||
Integer => ((ty.int_width() as usize) + 7) / 8, | ||
Pointer => 8, | ||
Float => 4, | ||
Double => 8, | ||
Struct => { | ||
if ty.is_packed() { | ||
let str_tys = ty.field_types(); | ||
str_tys.iter().fold(0, |s, t| s + ty_size(*t)) | ||
} else { | ||
let str_tys = ty.field_types(); | ||
let size = str_tys.iter().fold(0, |s, t| align(s, *t) + ty_size(*t)); | ||
align(size, ty) | ||
} | ||
} | ||
Array => { | ||
let len = ty.array_length(); | ||
let elt = ty.element_type(); | ||
let eltsz = ty_size(elt); | ||
len * eltsz | ||
} | ||
Vector => { | ||
let len = ty.vector_length(); | ||
let elt = ty.element_type(); | ||
let eltsz = ty_size(elt); | ||
len * eltsz | ||
} | ||
_ => bug!("ty_size: unhandled type") | ||
} | ||
} | ||
|
||
fn classify_ret_ty(ccx: &CrateContext, ret: &mut ArgType) { | ||
if is_reg_ty(ret.ty) { | ||
ret.extend_integer_width_to(64); | ||
} else { | ||
ret.make_indirect(ccx); | ||
} | ||
} | ||
|
||
fn classify_arg_ty(ccx: &CrateContext, arg: &mut ArgType, offset: &mut usize) { | ||
let orig_offset = *offset; | ||
let size = ty_size(arg.ty) * 8; | ||
let mut align = ty_align(arg.ty); | ||
|
||
align = cmp::min(cmp::max(align, 4), 8); | ||
*offset = align_up_to(*offset, align); | ||
*offset += align_up_to(size, align * 8) / 8; | ||
|
||
if !is_reg_ty(arg.ty) { | ||
arg.cast = Some(struct_ty(ccx, arg.ty)); | ||
arg.pad = padding_ty(ccx, align, orig_offset); | ||
} else { | ||
arg.extend_integer_width_to(64); | ||
} | ||
} | ||
|
||
fn is_reg_ty(ty: Type) -> bool { | ||
return match ty.kind() { | ||
Integer | ||
| Pointer | ||
| Float | ||
| Double | ||
| Vector => true, | ||
_ => false | ||
}; | ||
} | ||
|
||
fn padding_ty(ccx: &CrateContext, align: usize, offset: usize) -> Option<Type> { | ||
if ((align - 1 ) & offset) > 0 { | ||
Some(Type::i64(ccx)) | ||
} else { | ||
None | ||
} | ||
} | ||
|
||
fn coerce_to_int(ccx: &CrateContext, size: usize) -> Vec<Type> { | ||
let int_ty = Type::i64(ccx); | ||
let mut args = Vec::new(); | ||
|
||
let mut n = size / 64; | ||
while n > 0 { | ||
args.push(int_ty); | ||
n -= 1; | ||
} | ||
|
||
let r = size % 64; | ||
if r > 0 { | ||
unsafe { | ||
args.push(Type::from_ref(llvm::LLVMIntTypeInContext(ccx.llcx(), r as c_uint))); | ||
} | ||
} | ||
|
||
args | ||
} | ||
|
||
fn struct_ty(ccx: &CrateContext, ty: Type) -> Type { | ||
let size = ty_size(ty) * 8; | ||
Type::struct_(ccx, &coerce_to_int(ccx, size), false) | ||
} | ||
|
||
pub fn compute_abi_info(ccx: &CrateContext, fty: &mut FnType) { | ||
if !fty.ret.is_ignore() { | ||
classify_ret_ty(ccx, &mut fty.ret); | ||
} | ||
|
||
let mut offset = if fty.ret.is_indirect() { 8 } else { 0 }; | ||
for arg in &mut fty.args { | ||
if arg.is_ignore() { continue; } | ||
classify_arg_ty(ccx, arg, &mut offset); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters