Skip to content

Commit b66ed19

Browse files
committed
Make use of integer and pointers consistent
1 parent 2ecefb7 commit b66ed19

File tree

1 file changed

+33
-33
lines changed
  • crates/core_arch/src/mips

1 file changed

+33
-33
lines changed

crates/core_arch/src/mips/msa.rs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@ extern "C" {
108108
#[link_name = "llvm.mips.addv.d"]
109109
fn msa_addv_d(a: v2i64, b: v2i64) -> v2i64;
110110
#[link_name = "llvm.mips.addvi.b"]
111-
fn msa_addvi_b(a: v16i8, b: u32) -> v16i8;
111+
fn msa_addvi_b(a: v16i8, b: i32) -> v16i8;
112112
#[link_name = "llvm.mips.addvi.h"]
113-
fn msa_addvi_h(a: v8i16, b: u32) -> v8i16;
113+
fn msa_addvi_h(a: v8i16, b: i32) -> v8i16;
114114
#[link_name = "llvm.mips.addvi.w"]
115-
fn msa_addvi_w(a: v4i32, b: u32) -> v4i32;
115+
fn msa_addvi_w(a: v4i32, b: i32) -> v4i32;
116116
#[link_name = "llvm.mips.addvi.d"]
117-
fn msa_addvi_d(a: v2i64, b: u32) -> v2i64;
117+
fn msa_addvi_d(a: v2i64, b: i32) -> v2i64;
118118
#[link_name = "llvm.mips.and.v"]
119119
fn msa_and_v(a: v16u8, b: v16u8) -> v16u8;
120120
#[link_name = "llvm.mips.andi.b"]
121-
fn msa_andi_b(a: v16u8, b: u32) -> v16u8;
121+
fn msa_andi_b(a: v16u8, b: i32) -> v16u8;
122122
#[link_name = "llvm.mips.asub.s.b"]
123123
fn msa_asub_s_b(a: v16i8, b: v16i8) -> v16i8;
124124
#[link_name = "llvm.mips.asub.s.h"]
@@ -719,13 +719,13 @@ extern "C" {
719719
#[link_name = "llvm.mips.insve.d"]
720720
fn msa_insve_d(a: v2i64, b: i32, c: v2i64) -> v2i64;
721721
#[link_name = "llvm.mips.ld.b"]
722-
fn msa_ld_b(mem_addr: *mut i8, b: i32) -> v16i8;
722+
fn msa_ld_b(mem_addr: *mut u8, b: i32) -> v16i8;
723723
#[link_name = "llvm.mips.ld.h"]
724-
fn msa_ld_h(mem_addr: *mut i8, b: i32) -> v8i16;
724+
fn msa_ld_h(mem_addr: *mut u8, b: i32) -> v8i16;
725725
#[link_name = "llvm.mips.ld.w"]
726-
fn msa_ld_w(mem_addr: *mut i8, b: i32) -> v4i32;
726+
fn msa_ld_w(mem_addr: *mut u8, b: i32) -> v4i32;
727727
#[link_name = "llvm.mips.ld.d"]
728-
fn msa_ld_d(mem_addr: *mut i8, b: i32) -> v2i64;
728+
fn msa_ld_d(mem_addr: *mut u8, b: i32) -> v2i64;
729729
#[link_name = "llvm.mips.ldi.b"]
730730
fn msa_ldi_b(a: i32) -> v16i8;
731731
#[link_name = "llvm.mips.ldi.h"]
@@ -1063,13 +1063,13 @@ extern "C" {
10631063
#[link_name = "llvm.mips.srlri.d"]
10641064
fn msa_srlri_d(a: v2i64, b: i32) -> v2i64;
10651065
#[link_name = "llvm.mips.st.b"]
1066-
fn msa_st_b(a: v16i8, mem_addr: *mut i8, imm_s10: i32) -> ();
1066+
fn msa_st_b(a: v16i8, mem_addr: *mut u8, imm_s10: i32) -> ();
10671067
#[link_name = "llvm.mips.st.h"]
1068-
fn msa_st_h(a: v8i16, mem_addr: *mut i8, imm_s11: i32) -> ();
1068+
fn msa_st_h(a: v8i16, mem_addr: *mut u8, imm_s11: i32) -> ();
10691069
#[link_name = "llvm.mips.st.w"]
1070-
fn msa_st_w(a: v4i32, mem_addr: *mut i8, imm_s12: i32) -> ();
1070+
fn msa_st_w(a: v4i32, mem_addr: *mut u8, imm_s12: i32) -> ();
10711071
#[link_name = "llvm.mips.st.d"]
1072-
fn msa_st_d(a: v2i64, mem_addr: *mut i8, imm_s13: i32) -> ();
1072+
fn msa_st_d(a: v2i64, mem_addr: *mut u8, imm_s13: i32) -> ();
10731073
#[link_name = "llvm.mips.subs.s.b"]
10741074
fn msa_subs_s_b(a: v16i8, b: v16i8) -> v16i8;
10751075
#[link_name = "llvm.mips.subs.s.h"]
@@ -1410,7 +1410,7 @@ pub unsafe fn __msa_addv_d(a: v2i64, b: v2i64) -> v2i64 {
14101410
#[target_feature(enable = "msa")]
14111411
#[cfg_attr(test, assert_instr(addvi.b, imm5 = 0b10111))]
14121412
#[rustc_args_required_const(1)]
1413-
pub unsafe fn __msa_addvi_b(a: v16i8, imm5: u32) -> v16i8 {
1413+
pub unsafe fn __msa_addvi_b(a: v16i8, imm5: i32) -> v16i8 {
14141414
macro_rules! call {
14151415
($imm5:expr) => {
14161416
msa_addvi_b(a, $imm5)
@@ -1429,7 +1429,7 @@ pub unsafe fn __msa_addvi_b(a: v16i8, imm5: u32) -> v16i8 {
14291429
#[target_feature(enable = "msa")]
14301430
#[cfg_attr(test, assert_instr(addvi.h, imm5 = 0b10111))]
14311431
#[rustc_args_required_const(1)]
1432-
pub unsafe fn __msa_addvi_h(a: v8i16, imm5: u32) -> v8i16 {
1432+
pub unsafe fn __msa_addvi_h(a: v8i16, imm5: i32) -> v8i16 {
14331433
macro_rules! call {
14341434
($imm5:expr) => {
14351435
msa_addvi_h(a, $imm5)
@@ -1448,7 +1448,7 @@ pub unsafe fn __msa_addvi_h(a: v8i16, imm5: u32) -> v8i16 {
14481448
#[target_feature(enable = "msa")]
14491449
#[cfg_attr(test, assert_instr(addvi.w, imm5 = 0b10111))]
14501450
#[rustc_args_required_const(1)]
1451-
pub unsafe fn __msa_addvi_w(a: v4i32, imm5: u32) -> v4i32 {
1451+
pub unsafe fn __msa_addvi_w(a: v4i32, imm5: i32) -> v4i32 {
14521452
macro_rules! call {
14531453
($imm5:expr) => {
14541454
msa_addvi_w(a, $imm5)
@@ -1467,7 +1467,7 @@ pub unsafe fn __msa_addvi_w(a: v4i32, imm5: u32) -> v4i32 {
14671467
#[target_feature(enable = "msa")]
14681468
#[cfg_attr(test, assert_instr(addvi.d, imm5 = 0b10111))]
14691469
#[rustc_args_required_const(1)]
1470-
pub unsafe fn __msa_addvi_d(a: v2i64, imm5: u32) -> v2i64 {
1470+
pub unsafe fn __msa_addvi_d(a: v2i64, imm5: i32) -> v2i64 {
14711471
macro_rules! call {
14721472
($imm5:expr) => {
14731473
msa_addvi_d(a, $imm5)
@@ -1500,7 +1500,7 @@ pub unsafe fn __msa_and_v(a: v16u8, b: v16u8) -> v16u8 {
15001500
#[target_feature(enable = "msa")]
15011501
#[cfg_attr(test, assert_instr(andi.b, imm8 = 0b10010111))]
15021502
#[rustc_args_required_const(1)]
1503-
pub unsafe fn __msa_andi_b(a: v16u8, imm8: u32) -> v16u8 {
1503+
pub unsafe fn __msa_andi_b(a: v16u8, imm8: i32) -> v16u8 {
15041504
macro_rules! call {
15051505
($imm8:expr) => {
15061506
msa_andi_b(a, $imm8)
@@ -5946,7 +5946,7 @@ pub unsafe fn __msa_insve_d(a: v2i64, imm1: i32, c: v2i64) -> v2i64 {
59465946
#[target_feature(enable = "msa")]
59475947
#[cfg_attr(test, assert_instr(ld.b, imm_s10 = 0b1111111111))]
59485948
#[rustc_args_required_const(1)]
5949-
pub unsafe fn __msa_ld_b(mem_addr: *mut i8, imm_s10: i32) -> v16i8 {
5949+
pub unsafe fn __msa_ld_b(mem_addr: *mut u8, imm_s10: i32) -> v16i8 {
59505950
macro_rules! call {
59515951
($imm_s10:expr) => {
59525952
msa_ld_b(mem_addr, $imm_s10)
@@ -5965,7 +5965,7 @@ pub unsafe fn __msa_ld_b(mem_addr: *mut i8, imm_s10: i32) -> v16i8 {
59655965
#[target_feature(enable = "msa")]
59665966
#[cfg_attr(test, assert_instr(ld.h, imm_s11 = 0b11111111111))]
59675967
#[rustc_args_required_const(1)]
5968-
pub unsafe fn __msa_ld_h(mem_addr: *mut i8, imm_s11: i32) -> v8i16 {
5968+
pub unsafe fn __msa_ld_h(mem_addr: *mut u8, imm_s11: i32) -> v8i16 {
59695969
macro_rules! call {
59705970
($imm_s11:expr) => {
59715971
msa_ld_h(mem_addr, $imm_s11)
@@ -5984,7 +5984,7 @@ pub unsafe fn __msa_ld_h(mem_addr: *mut i8, imm_s11: i32) -> v8i16 {
59845984
#[target_feature(enable = "msa")]
59855985
#[cfg_attr(test, assert_instr(ld.w, imm_s12 = 0b111111111111))]
59865986
#[rustc_args_required_const(1)]
5987-
pub unsafe fn __msa_ld_w(mem_addr: *mut i8, imm_s12: i32) -> v4i32 {
5987+
pub unsafe fn __msa_ld_w(mem_addr: *mut u8, imm_s12: i32) -> v4i32 {
59885988
macro_rules! call {
59895989
($imm_s12:expr) => {
59905990
msa_ld_w(mem_addr, $imm_s12)
@@ -6003,7 +6003,7 @@ pub unsafe fn __msa_ld_w(mem_addr: *mut i8, imm_s12: i32) -> v4i32 {
60036003
#[target_feature(enable = "msa")]
60046004
#[cfg_attr(test, assert_instr(ld.d, imm_s13 = 0b1111111111111))]
60056005
#[rustc_args_required_const(1)]
6006-
pub unsafe fn __msa_ld_d(mem_addr: *mut i8, imm_s13: i32) -> v2i64 {
6006+
pub unsafe fn __msa_ld_d(mem_addr: *mut u8, imm_s13: i32) -> v2i64 {
60076007
macro_rules! call {
60086008
($imm_s13:expr) => {
60096009
msa_ld_d(mem_addr, $imm_s13)
@@ -8706,7 +8706,7 @@ pub unsafe fn __msa_srlri_d(a: v2i64, imm6: i32) -> v2i64 {
87068706
#[target_feature(enable = "msa")]
87078707
#[cfg_attr(test, assert_instr(st.b, imm_s10 = 0b1111111111))]
87088708
#[rustc_args_required_const(2)]
8709-
pub unsafe fn __msa_st_b(a: v16i8, mem_addr: *mut i8, imm_s10: i32) -> () {
8709+
pub unsafe fn __msa_st_b(a: v16i8, mem_addr: *mut u8, imm_s10: i32) -> () {
87108710
macro_rules! call {
87118711
($imm_s10:expr) => {
87128712
msa_st_b(a, mem_addr, $imm_s10)
@@ -8725,7 +8725,7 @@ pub unsafe fn __msa_st_b(a: v16i8, mem_addr: *mut i8, imm_s10: i32) -> () {
87258725
#[target_feature(enable = "msa")]
87268726
#[cfg_attr(test, assert_instr(st.h, imm_s11 = 0b11111111111))]
87278727
#[rustc_args_required_const(2)]
8728-
pub unsafe fn __msa_st_h(a: v8i16, mem_addr: *mut i8, imm_s11: i32) -> () {
8728+
pub unsafe fn __msa_st_h(a: v8i16, mem_addr: *mut u8, imm_s11: i32) -> () {
87298729
macro_rules! call {
87308730
($imm_s11:expr) => {
87318731
msa_st_h(a, mem_addr, $imm_s11)
@@ -8744,7 +8744,7 @@ pub unsafe fn __msa_st_h(a: v8i16, mem_addr: *mut i8, imm_s11: i32) -> () {
87448744
#[target_feature(enable = "msa")]
87458745
#[cfg_attr(test, assert_instr(st.w, imm_s12 = 0b111111111111))]
87468746
#[rustc_args_required_const(2)]
8747-
pub unsafe fn __msa_st_w(a: v4i32, mem_addr: *mut i8, imm_s12: i32) -> () {
8747+
pub unsafe fn __msa_st_w(a: v4i32, mem_addr: *mut u8, imm_s12: i32) -> () {
87488748
macro_rules! call {
87498749
($imm_s12:expr) => {
87508750
msa_st_w(a, mem_addr, $imm_s12)
@@ -8763,7 +8763,7 @@ pub unsafe fn __msa_st_w(a: v4i32, mem_addr: *mut i8, imm_s12: i32) -> () {
87638763
#[target_feature(enable = "msa")]
87648764
#[cfg_attr(test, assert_instr(st.d, imm_s13 = 0b1111111111111))]
87658765
#[rustc_args_required_const(2)]
8766-
pub unsafe fn __msa_st_d(a: v2i64, mem_addr: *mut i8, imm_s13: i32) -> () {
8766+
pub unsafe fn __msa_st_d(a: v2i64, mem_addr: *mut u8, imm_s13: i32) -> () {
87678767
macro_rules! call {
87688768
($imm_s13:expr) => {
87698769
msa_st_d(a, mem_addr, $imm_s13)
@@ -14811,7 +14811,7 @@ mod tests {
1481114811
16, 17, 18, 19, 20, 21, 22, 23,
1481214812
24, 25, 26, 27, 28, 29, 30, 31
1481314813
];
14814-
let p = &mut a[4] as *mut _ as *mut i8;
14814+
let p = &mut a[4] as *mut _ as *mut u8;
1481514815
#[rustfmt::skip]
1481614816
let r = i8x16::new(
1481714817
13, 14, 15, 16,
@@ -14830,7 +14830,7 @@ mod tests {
1483014830
0, 1, 2, 3, 4, 5, 6, 7,
1483114831
8, 9, 10, 11, 12, 13, 14, 15
1483214832
];
14833-
let p = &mut a[4] as *mut _ as *mut i8;
14833+
let p = &mut a[4] as *mut _ as *mut u8;
1483414834
#[rustfmt::skip]
1483514835
let r = i16x8::new(3, 4, 5, 6, 7, 8, 9, 10);
1483614836

@@ -14841,7 +14841,7 @@ mod tests {
1484114841
unsafe fn test_msa_ld_w() {
1484214842
#[rustfmt::skip]
1484314843
let mut a : [i32; 8] = [0, 1, 2, 3, 4, 5, 6, 7];
14844-
let p = &mut a[3] as *mut _ as *mut i8;
14844+
let p = &mut a[3] as *mut _ as *mut u8;
1484514845
#[rustfmt::skip]
1484614846
let r = i32x4::new(2, 3, 4, 5);
1484714847

@@ -14852,7 +14852,7 @@ mod tests {
1485214852
unsafe fn test_msa_ld_d() {
1485314853
#[rustfmt::skip]
1485414854
let mut a : [i64; 8] = [0, 1, 2, 3, 4, 5, 6, 7];
14855-
let p = &mut a[4] as *mut _ as *mut i8;
14855+
let p = &mut a[4] as *mut _ as *mut u8;
1485614856
#[rustfmt::skip]
1485714857
let r = i64x2::new(0, 1);
1485814858

@@ -17825,7 +17825,7 @@ mod tests {
1782517825
let mut arr: [i16; 8] = [0, 0, 0, 0, 0, 0, 0, 0];
1782617826
#[rustfmt::skip]
1782717827
let r : [i16; 8] = [13, 14, 15, 16, 17, 18, 19, 20];
17828-
__msa_st_h(::mem::transmute(a), arr.as_mut_ptr() as *mut i8, 0);
17828+
__msa_st_h(::mem::transmute(a), arr.as_mut_ptr() as *mut u8, 0);
1782917829
assert_eq!(arr, r);
1783017830
}
1783117831

@@ -17836,7 +17836,7 @@ mod tests {
1783617836
let mut arr: [i32; 4] = [0, 0, 0, 0];
1783717837
#[rustfmt::skip]
1783817838
let r : [i32; 4] = [13, 14, 15, 16];
17839-
__msa_st_w(::mem::transmute(a), arr.as_mut_ptr() as *mut i8, 0);
17839+
__msa_st_w(::mem::transmute(a), arr.as_mut_ptr() as *mut u8, 0);
1784017840
assert_eq!(arr, r);
1784117841
}
1784217842

@@ -17847,7 +17847,7 @@ mod tests {
1784717847
let mut arr: [i64; 2] = [0, 0];
1784817848
#[rustfmt::skip]
1784917849
let r : [i64; 2] = [13, 14];
17850-
__msa_st_d(::mem::transmute(a), arr.as_mut_ptr() as *mut i8, 0);
17850+
__msa_st_d(::mem::transmute(a), arr.as_mut_ptr() as *mut u8, 0);
1785117851
assert_eq!(arr, r);
1785217852
}
1785317853

0 commit comments

Comments
 (0)