Skip to content

Commit abc9132

Browse files
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents b5563f7 + cdbad72 commit abc9132

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ features = ["c"]
6969

7070
### Porting Reminders
7171

72-
1. [Rust][4] and [C][5] have slightly different operator precedence. C evaluates comparisons (`== !=`) before bitwise operations (`& | ^`), while Rust evaluates the other way.
72+
1. [Rust][5a] and [C][5b] have slightly different operator precedence. C evaluates comparisons (`== !=`) before bitwise operations (`& | ^`), while Rust evaluates the other way.
7373
2. C assumes wrapping operations everywhere. Rust panics on overflow when in debug mode. Consider using the [Wrapping][6] type or the explicit [wrapping_*][7] functions where applicable.
7474
3. Note [C implicit casts][8], especially integer promotion. Rust is much more explicit about casting, so be sure that any cast which affects the output is ported to the Rust implementation.
7575
4. Rust has [many functions][9] for integer or floating point manipulation in the standard library. Consider using one of these functions rather than porting a new one.
7676

77-
[4]: https://doc.rust-lang.org/reference.html#operator-precedence
78-
[5]: http://en.cppreference.com/w/c/language/operator_precedence
77+
[5a]: https://doc.rust-lang.org/reference/expressions.html#expression-precedence
78+
[5b]: http://en.cppreference.com/w/c/language/operator_precedence
7979
[6]: https://doc.rust-lang.org/core/num/struct.Wrapping.html
8080
[7]: https://doc.rust-lang.org/std/primitive.i32.html#method.wrapping_add
8181
[8]: http://en.cppreference.com/w/cpp/language/implicit_conversion

src/riscv32.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
intrinsics! {
22
// Implementation from gcc
33
// https://raw.githubusercontent.com/gcc-mirror/gcc/master/libgcc/config/epiphany/mulsi3.c
4-
pub extern "C" fn __mulsi3(mut a: u32, mut b: u32) -> u32 {
4+
pub extern "C" fn __mulsi3(a: u32, b: u32) -> u32 {
5+
let (mut a, mut b) = (a, b);
56
let mut r: usize = 0;
67

78
while a > 0 {

0 commit comments

Comments
 (0)