Skip to content

Commit 0d2201e

Browse files
samuelasamuela
committed
llvm_asm! is the new asm!
1 parent 56cae55 commit 0d2201e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+425
-425
lines changed

‎archival/dpkg.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2448,7 +2448,7 @@ pub unsafe fn dpkg_main(mut _argc: libc::c_int, mut argv: *mut *mut libc::c_char
24482448
as *mut *mut globals);
24492449
*fresh11 = crate::libbb::xfuncs_printf::xzalloc(::std::mem::size_of::<globals>() as libc::c_ulong)
24502450
as *mut globals;
2451-
asm!("" : : : "memory" : "volatile");
2451+
llvm_asm!("" : : : "memory" : "volatile");
24522452
opt = crate::libbb::getopt32::getopt32long(
24532453
argv,
24542454
b"CilPruF:\x00" as *const u8 as *const libc::c_char,

‎archival/gzip.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2093,7 +2093,7 @@ pub unsafe fn gzip_main(mut argc: libc::c_int, mut argv: *mut *mut libc::c_char)
20932093
) as *mut libc::c_char)
20942094
.offset(::std::mem::size_of::<globals>() as libc::c_ulong as isize)
20952095
as *mut libc::c_void as *mut globals;
2096-
asm!("" : : : "memory" : "volatile");
2096+
llvm_asm!("" : : : "memory" : "volatile");
20972097
/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
20982098
opt = crate::libbb::getopt32::getopt32long(
20992099
argv,

‎archival/lzop.rs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ unsafe fn read32() -> u32 {
751751
let fresh61 = &mut __v;
752752
let fresh62;
753753
let fresh63 = __x;
754-
asm!("bswap $0" : "=r" (fresh62) : "0"
754+
llvm_asm!("bswap $0" : "=r" (fresh62) : "0"
755755
(c2rust_asm_casts::AsmCast::cast_in(fresh61, fresh63)) :);
756756
c2rust_asm_casts::AsmCast::cast_out(fresh61, fresh63, fresh62);
757757
}
@@ -789,7 +789,7 @@ unsafe fn f_read32() -> u32 {
789789
let fresh64 = &mut __v;
790790
let fresh65;
791791
let fresh66 = __x;
792-
asm!("bswap $0" : "=r" (fresh65) : "0"
792+
llvm_asm!("bswap $0" : "=r" (fresh65) : "0"
793793
(c2rust_asm_casts::AsmCast::cast_in(fresh64, fresh66)) :);
794794
c2rust_asm_casts::AsmCast::cast_out(fresh64, fresh66, fresh65);
795795
}
@@ -809,7 +809,7 @@ unsafe fn write32(mut v: u32) {
809809
let fresh67 = &mut __v;
810810
let fresh68;
811811
let fresh69 = __x;
812-
asm!("bswap $0" : "=r" (fresh68) : "0"
812+
llvm_asm!("bswap $0" : "=r" (fresh68) : "0"
813813
(c2rust_asm_casts::AsmCast::cast_in(fresh67, fresh69)) :);
814814
c2rust_asm_casts::AsmCast::cast_out(fresh67, fresh69, fresh68);
815815
}
@@ -890,7 +890,7 @@ unsafe fn lzo_compress(mut h: *const header_t) -> libc::c_int {
890890
let fresh70 = &mut __v;
891891
let fresh71;
892892
let fresh72 = __x;
893-
asm!("bswap $0" : "=r" (fresh71) : "0"
893+
llvm_asm!("bswap $0" : "=r" (fresh71) : "0"
894894
(c2rust_asm_casts::AsmCast::cast_in(fresh70, fresh72)) :);
895895
c2rust_asm_casts::AsmCast::cast_out(fresh70, fresh72, fresh71);
896896
}
@@ -959,7 +959,7 @@ unsafe fn lzo_compress(mut h: *const header_t) -> libc::c_int {
959959
let fresh74 = &mut __v;
960960
let fresh75;
961961
let fresh76 = __x;
962-
asm!("bswap $0" : "=r" (fresh75) : "0"
962+
llvm_asm!("bswap $0" : "=r" (fresh75) : "0"
963963
(c2rust_asm_casts::AsmCast::cast_in(fresh74, fresh76)) :);
964964
c2rust_asm_casts::AsmCast::cast_out(fresh74, fresh76, fresh75);
965965
}
@@ -981,7 +981,7 @@ unsafe fn lzo_compress(mut h: *const header_t) -> libc::c_int {
981981
let fresh78 = &mut __v;
982982
let fresh79;
983983
let fresh80 = __x;
984-
asm!("bswap $0" : "=r" (fresh79) : "0"
984+
llvm_asm!("bswap $0" : "=r" (fresh79) : "0"
985985
(c2rust_asm_casts::AsmCast::cast_in(fresh78, fresh80)) :);
986986
c2rust_asm_casts::AsmCast::cast_out(fresh78, fresh80, fresh79);
987987
}
@@ -1004,7 +1004,7 @@ unsafe fn lzo_compress(mut h: *const header_t) -> libc::c_int {
10041004
let fresh82 = &mut __v;
10051005
let fresh83;
10061006
let fresh84 = __x;
1007-
asm!("bswap $0" : "=r" (fresh83) : "0"
1007+
llvm_asm!("bswap $0" : "=r" (fresh83) : "0"
10081008
(c2rust_asm_casts::AsmCast::cast_in(fresh82, fresh84)) :);
10091009
c2rust_asm_casts::AsmCast::cast_out(fresh82, fresh84, fresh83);
10101010
}
@@ -1026,7 +1026,7 @@ unsafe fn lzo_compress(mut h: *const header_t) -> libc::c_int {
10261026
let fresh86 = &mut __v;
10271027
let fresh87;
10281028
let fresh88 = __x;
1029-
asm!("bswap $0" : "=r" (fresh87) : "0"
1029+
llvm_asm!("bswap $0" : "=r" (fresh87) : "0"
10301030
(c2rust_asm_casts::AsmCast::cast_in(fresh86, fresh88)) :);
10311031
c2rust_asm_casts::AsmCast::cast_out(fresh86, fresh88, fresh87);
10321032
}
@@ -1050,7 +1050,7 @@ unsafe fn lzo_compress(mut h: *const header_t) -> libc::c_int {
10501050
let fresh90 = &mut __v;
10511051
let fresh91;
10521052
let fresh92 = __x;
1053-
asm!("bswap $0" : "=r" (fresh91) : "0"
1053+
llvm_asm!("bswap $0" : "=r" (fresh91) : "0"
10541054
(c2rust_asm_casts::AsmCast::cast_in(fresh90, fresh92)) :);
10551055
c2rust_asm_casts::AsmCast::cast_out(fresh90, fresh92, fresh91);
10561056
}
@@ -1072,7 +1072,7 @@ unsafe fn lzo_compress(mut h: *const header_t) -> libc::c_int {
10721072
let fresh94 = &mut __v;
10731073
let fresh95;
10741074
let fresh96 = __x;
1075-
asm!("bswap $0" : "=r" (fresh95) : "0"
1075+
llvm_asm!("bswap $0" : "=r" (fresh95) : "0"
10761076
(c2rust_asm_casts::AsmCast::cast_in(fresh94, fresh96)) :);
10771077
c2rust_asm_casts::AsmCast::cast_out(fresh94, fresh96, fresh95);
10781078
}
@@ -1357,7 +1357,7 @@ unsafe fn write_header(mut h: *mut header_t) {
13571357
let fresh98 = &mut __v;
13581358
let fresh99;
13591359
let fresh100 = __x;
1360-
asm!("bswap $0" : "=r" (fresh99) : "0"
1360+
llvm_asm!("bswap $0" : "=r" (fresh99) : "0"
13611361
(c2rust_asm_casts::AsmCast::cast_in(fresh98, fresh100)) :);
13621362
c2rust_asm_casts::AsmCast::cast_out(fresh98, fresh100, fresh99);
13631363
}
@@ -1396,7 +1396,7 @@ unsafe fn read_header(mut h: *mut header_t) -> libc::c_int {
13961396
let fresh101 = &mut __v;
13971397
let fresh102;
13981398
let fresh103 = __x;
1399-
asm!("rorw $$8, ${0:w}" : "=r" (fresh102) : "0"
1399+
llvm_asm!("rorw $$8, ${0:w}" : "=r" (fresh102) : "0"
14001400
(c2rust_asm_casts::AsmCast::cast_in(fresh101, fresh103)) : "cc");
14011401
c2rust_asm_casts::AsmCast::cast_out(fresh101, fresh103, fresh102);
14021402
}
@@ -1415,7 +1415,7 @@ unsafe fn read_header(mut h: *mut header_t) -> libc::c_int {
14151415
let fresh104 = &mut __v;
14161416
let fresh105;
14171417
let fresh106 = __x;
1418-
asm!("rorw $$8, ${0:w}" : "=r" (fresh105) : "0"
1418+
llvm_asm!("rorw $$8, ${0:w}" : "=r" (fresh105) : "0"
14191419
(c2rust_asm_casts::AsmCast::cast_in(fresh104, fresh106)) : "cc");
14201420
c2rust_asm_casts::AsmCast::cast_out(fresh104, fresh106, fresh105);
14211421
}
@@ -1462,7 +1462,7 @@ unsafe fn read_header(mut h: *mut header_t) -> libc::c_int {
14621462
let fresh107 = &mut __v;
14631463
let fresh108;
14641464
let fresh109 = __x;
1465-
asm!("bswap $0" : "=r" (fresh108) : "0"
1465+
llvm_asm!("bswap $0" : "=r" (fresh108) : "0"
14661466
(c2rust_asm_casts::AsmCast::cast_in(fresh107, fresh109)) :);
14671467
c2rust_asm_casts::AsmCast::cast_out(fresh107, fresh109, fresh108);
14681468
}
@@ -1559,7 +1559,7 @@ unsafe fn do_lzo_compress() -> libc::c_int {
15591559
let fresh110 = &mut __v;
15601560
let fresh111;
15611561
let fresh112 = __x;
1562-
asm!("rorw $$8, ${0:w}" : "=r" (fresh111) : "0"
1562+
llvm_asm!("rorw $$8, ${0:w}" : "=r" (fresh111) : "0"
15631563
(c2rust_asm_casts::AsmCast::cast_in(fresh110, fresh112)) : "cc");
15641564
c2rust_asm_casts::AsmCast::cast_out(fresh110, fresh112, fresh111);
15651565
}
@@ -1575,7 +1575,7 @@ unsafe fn do_lzo_compress() -> libc::c_int {
15751575
let fresh113 = &mut __v;
15761576
let fresh114;
15771577
let fresh115 = __x;
1578-
asm!("rorw $$8, ${0:w}" : "=r" (fresh114) : "0"
1578+
llvm_asm!("rorw $$8, ${0:w}" : "=r" (fresh114) : "0"
15791579
(c2rust_asm_casts::AsmCast::cast_in(fresh113, fresh115)) : "cc");
15801580
c2rust_asm_casts::AsmCast::cast_out(fresh113, fresh115, fresh114);
15811581
}
@@ -1591,7 +1591,7 @@ unsafe fn do_lzo_compress() -> libc::c_int {
15911591
let fresh116 = &mut __v;
15921592
let fresh117;
15931593
let fresh118 = __x;
1594-
asm!("rorw $$8, ${0:w}" : "=r" (fresh117) : "0"
1594+
llvm_asm!("rorw $$8, ${0:w}" : "=r" (fresh117) : "0"
15951595
(c2rust_asm_casts::AsmCast::cast_in(fresh116, fresh118)) : "cc");
15961596
c2rust_asm_casts::AsmCast::cast_out(fresh116, fresh118, fresh117);
15971597
}
@@ -1609,7 +1609,7 @@ unsafe fn do_lzo_compress() -> libc::c_int {
16091609
let fresh119 = &mut __v;
16101610
let fresh120;
16111611
let fresh121 = __x;
1612-
asm!("bswap $0" : "=r" (fresh120) : "0"
1612+
llvm_asm!("bswap $0" : "=r" (fresh120) : "0"
16131613
(c2rust_asm_casts::AsmCast::cast_in(fresh119, fresh121)) :);
16141614
c2rust_asm_casts::AsmCast::cast_out(fresh119, fresh121, fresh120);
16151615
}
@@ -1630,7 +1630,7 @@ unsafe fn do_lzo_compress() -> libc::c_int {
16301630
let fresh122 = &mut __v;
16311631
let fresh123;
16321632
let fresh124 = __x;
1633-
asm!("bswap $0" : "=r" (fresh123) : "0"
1633+
llvm_asm!("bswap $0" : "=r" (fresh123) : "0"
16341634
(c2rust_asm_casts::AsmCast::cast_in(fresh122, fresh124)) :);
16351635
c2rust_asm_casts::AsmCast::cast_out(fresh122, fresh124, fresh123);
16361636
}
@@ -1649,7 +1649,7 @@ unsafe fn do_lzo_compress() -> libc::c_int {
16491649
let fresh125 = &mut __v;
16501650
let fresh126;
16511651
let fresh127 = __x;
1652-
asm!("bswap $0" : "=r" (fresh126) : "0"
1652+
llvm_asm!("bswap $0" : "=r" (fresh126) : "0"
16531653
(c2rust_asm_casts::AsmCast::cast_in(fresh125, fresh127)) :);
16541654
c2rust_asm_casts::AsmCast::cast_out(fresh125, fresh127, fresh126);
16551655
}

‎archival/rpm.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ unsafe fn rpm_gettags(mut filename: *const libc::c_char) -> libc::c_int {
216216
let fresh0 = &mut __v;
217217
let fresh1;
218218
let fresh2 = __x;
219-
asm!("bswap $0" : "=r" (fresh1) : "0"
219+
llvm_asm!("bswap $0" : "=r" (fresh1) : "0"
220220
(c2rust_asm_casts::AsmCast::cast_in(fresh0, fresh2)) :);
221221
c2rust_asm_casts::AsmCast::cast_out(fresh0, fresh2, fresh1);
222222
}
@@ -240,7 +240,7 @@ unsafe fn rpm_gettags(mut filename: *const libc::c_char) -> libc::c_int {
240240
let fresh3 = &mut __v;
241241
let fresh4;
242242
let fresh5 = __x;
243-
asm!("bswap $0" : "=r" (fresh4) : "0"
243+
llvm_asm!("bswap $0" : "=r" (fresh4) : "0"
244244
(c2rust_asm_casts::AsmCast::cast_in(fresh3, fresh5)) :);
245245
c2rust_asm_casts::AsmCast::cast_out(fresh3, fresh5, fresh4);
246246
}
@@ -258,7 +258,7 @@ unsafe fn rpm_gettags(mut filename: *const libc::c_char) -> libc::c_int {
258258
let fresh6 = &mut __v;
259259
let fresh7;
260260
let fresh8 = __x;
261-
asm!("bswap $0" : "=r" (fresh7) : "0"
261+
llvm_asm!("bswap $0" : "=r" (fresh7) : "0"
262262
(c2rust_asm_casts::AsmCast::cast_in(fresh6, fresh8)) :);
263263
c2rust_asm_casts::AsmCast::cast_out(fresh6, fresh8, fresh7);
264264
}
@@ -300,7 +300,7 @@ unsafe fn rpm_gettags(mut filename: *const libc::c_char) -> libc::c_int {
300300
let fresh11 = &mut __v;
301301
let fresh12;
302302
let fresh13 = __x;
303-
asm!("bswap $0" : "=r" (fresh12) : "0"
303+
llvm_asm!("bswap $0" : "=r" (fresh12) : "0"
304304
(c2rust_asm_casts::AsmCast::cast_in(fresh11, fresh13)) :);
305305
c2rust_asm_casts::AsmCast::cast_out(fresh11, fresh13, fresh12);
306306
}
@@ -318,7 +318,7 @@ unsafe fn rpm_gettags(mut filename: *const libc::c_char) -> libc::c_int {
318318
let fresh14 = &mut __v;
319319
let fresh15;
320320
let fresh16 = __x;
321-
asm!("bswap $0" : "=r" (fresh15) : "0"
321+
llvm_asm!("bswap $0" : "=r" (fresh15) : "0"
322322
(c2rust_asm_casts::AsmCast::cast_in(fresh14, fresh16)) :);
323323
c2rust_asm_casts::AsmCast::cast_out(fresh14, fresh16, fresh15);
324324
}
@@ -336,7 +336,7 @@ unsafe fn rpm_gettags(mut filename: *const libc::c_char) -> libc::c_int {
336336
let fresh17 = &mut __v;
337337
let fresh18;
338338
let fresh19 = __x;
339-
asm!("bswap $0" : "=r" (fresh18) : "0"
339+
llvm_asm!("bswap $0" : "=r" (fresh18) : "0"
340340
(c2rust_asm_casts::AsmCast::cast_in(fresh17, fresh19)) :);
341341
c2rust_asm_casts::AsmCast::cast_out(fresh17, fresh19, fresh18);
342342
}
@@ -354,7 +354,7 @@ unsafe fn rpm_gettags(mut filename: *const libc::c_char) -> libc::c_int {
354354
let fresh20 = &mut __v;
355355
let fresh21;
356356
let fresh22 = __x;
357-
asm!("bswap $0" : "=r" (fresh21) : "0"
357+
llvm_asm!("bswap $0" : "=r" (fresh21) : "0"
358358
(c2rust_asm_casts::AsmCast::cast_in(fresh20, fresh22)) :);
359359
c2rust_asm_casts::AsmCast::cast_out(fresh20, fresh22, fresh21);
360360
}
@@ -475,7 +475,7 @@ unsafe fn rpm_getint(mut tag: libc::c_int, mut itemindex: libc::c_int) -> libc::
475475
let fresh25 = &mut __v;
476476
let fresh26;
477477
let fresh27 = __x;
478-
asm!("bswap $0" : "=r" (fresh26) : "0"
478+
llvm_asm!("bswap $0" : "=r" (fresh26) : "0"
479479
(c2rust_asm_casts::AsmCast::cast_in(fresh25, fresh27)) :);
480480
c2rust_asm_casts::AsmCast::cast_out(fresh25, fresh27, fresh26);
481481
}
@@ -494,7 +494,7 @@ unsafe fn rpm_getint(mut tag: libc::c_int, mut itemindex: libc::c_int) -> libc::
494494
let fresh28 = &mut __v;
495495
let fresh29;
496496
let fresh30 = __x;
497-
asm!("rorw $$8, ${0:w}" : "=r" (fresh29) : "0"
497+
llvm_asm!("rorw $$8, ${0:w}" : "=r" (fresh29) : "0"
498498
(c2rust_asm_casts::AsmCast::cast_in(fresh28, fresh30)) : "cc");
499499
c2rust_asm_casts::AsmCast::cast_out(fresh28, fresh30, fresh29);
500500
}

‎console_tools/showkey.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub unsafe fn showkey_main(
7979
as *mut *mut globals);
8080
*fresh0 = crate::libbb::xfuncs_printf::xzalloc(::std::mem::size_of::<globals>() as libc::c_ulong)
8181
as *mut globals;
82-
asm!("" : : : "memory" : "volatile");
82+
llvm_asm!("" : : : "memory" : "volatile");
8383
// FIXME: aks are all mutually exclusive
8484
crate::libbb::getopt32::getopt32(argv, b"aks\x00" as *const u8 as *const libc::c_char);
8585
// prepare for raw mode

‎coreutils/dd.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ pub unsafe fn dd_main(mut _argc: libc::c_int, mut argv: *mut *mut libc::c_char)
662662
let fresh3 = &mut __v;
663663
let fresh4;
664664
let fresh5 = __x;
665-
asm!("rorw $$8, ${0:w}" : "=r" (fresh4) : "0"
665+
llvm_asm!("rorw $$8, ${0:w}" : "=r" (fresh4) : "0"
666666
(c2rust_asm_casts::AsmCast::cast_in(fresh3, fresh5)) : "cc");
667667
c2rust_asm_casts::AsmCast::cast_out(fresh3, fresh5, fresh4);
668668
}

‎coreutils/test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,7 @@ pub unsafe fn test_main(mut argc: libc::c_int, mut argv: *mut *mut libc::c_char)
13721372
*fresh1 =
13731373
crate::libbb::xfuncs_printf::xzalloc(::std::mem::size_of::<test_statics>() as libc::c_ulong)
13741374
as *mut test_statics;
1375-
asm!("" : : : "memory" : "volatile");
1375+
llvm_asm!("" : : : "memory" : "volatile");
13761376
res = _setjmp((*test_ptr_to_statics).leaving.as_mut_ptr());
13771377
if !(res != 0) {
13781378
/* resetting ngroups is probably unnecessary. it will

‎editors/awk.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21254,7 +21254,7 @@ pub unsafe fn awk_main(mut _argc: libc::c_int, mut argv: *mut *mut libc::c_char)
2125421254
) as *mut libc::c_char)
2125521255
.offset(::std::mem::size_of::<globals>() as libc::c_ulong as isize)
2125621256
as *mut libc::c_void as *mut globals;
21257-
asm!("" : : : "memory" : "volatile");
21257+
llvm_asm!("" : : : "memory" : "volatile");
2125821258
(*(ptr_to_globals as *mut globals2)).next_token__ltclass = (1i32 << 14i32 | 1i32 << 15i32) as u32;
2125921259
(*(ptr_to_globals as *mut globals2)).evaluate__seed = 1i32 as libc::c_uint;
2126021260
/* Undo busybox.c, or else strtod may eat ','! This breaks parsing:

‎editors/diff.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ pub unsafe fn diff_main(mut _argc: libc::c_int, mut argv: *mut *mut libc::c_char
13341334
as *mut *mut globals);
13351335
*fresh11 = crate::libbb::xfuncs_printf::xzalloc(::std::mem::size_of::<globals>() as libc::c_ulong)
13361336
as *mut globals;
1337-
asm!("" : : : "memory" : "volatile");
1337+
llvm_asm!("" : : : "memory" : "volatile");
13381338
(*ptr_to_globals).opt_U_context = 3i32;
13391339
/* exactly 2 params; collect multiple -L <label>; -U N */
13401340
crate::libbb::getopt32::getopt32long(

‎editors/ed.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,7 @@ pub unsafe fn ed_main(mut _argc: libc::c_int, mut argv: *mut *mut libc::c_char)
12041204
as *mut *mut globals);
12051205
*fresh14 = crate::libbb::xfuncs_printf::xzalloc(::std::mem::size_of::<globals>() as libc::c_ulong)
12061206
as *mut globals;
1207-
asm!("" : : : "memory" : "volatile");
1207+
llvm_asm!("" : : : "memory" : "volatile");
12081208
(*ptr_to_globals).bufSize = INITBUF_SIZE as libc::c_int;
12091209
(*ptr_to_globals).bufBase = xmalloc((*ptr_to_globals).bufSize as size_t) as *mut libc::c_char;
12101210
(*ptr_to_globals).bufPtr = (*ptr_to_globals).bufBase;

0 commit comments

Comments
 (0)