Be explicit about pointer casts

Removes compiler warning added to nightly recently. People often
accidentally cast function pointers to integers when they meant to
call the function and cast the result, but they forgot the (). So
because we actually want to cast a function pointer we have to be clear
about that.

Author: thejpster

examples/mps3-an536/src/bin/abt-exception-a32.rs

@@ -88,7 +88,7 @@ unsafe fn data_abort_handler(addr: usize) -> usize {
     enable_alignment_check();
 
     // note the fault isn't at the start of the function
-    let expect_fault_at = unaligned_from_a32 as usize + 8;
+    let expect_fault_at = unaligned_from_a32 as unsafe extern "C" fn() as usize + 8;
 
     if addr == expect_fault_at {
         println!("caught unaligned_from_a32");

examples/mps3-an536/src/bin/abt-exception-t32.rs

@@ -88,7 +88,7 @@ unsafe fn data_abort_handler(addr: usize) -> usize {
     enable_alignment_check();
 
     // note the fault isn't at the start of the function
-    let expect_fault_at = unaligned_from_t32 as usize + 5;
+    let expect_fault_at = unaligned_from_t32 as unsafe extern "C" fn() as usize + 5;
 
     if addr == expect_fault_at {
         println!("caught unaligned_from_t32");

examples/mps3-an536/src/bin/prefetch-exception-a32.rs

@@ -63,12 +63,12 @@ unsafe fn prefetch_abort_handler(addr: usize) -> usize {
     let ifar = Ifar::read();
     println!("IFAR (Faulting Address Register): {:?}", ifar);
 
-    if addr == bkpt_from_a32 as usize {
+    if addr == bkpt_from_a32 as unsafe extern "C" fn() as usize {
         println!("caught bkpt_from_a32");
     } else {
         println!(
             "Bad fault address {:08x} is not {:08x}",
-            addr, bkpt_from_a32 as usize
+            addr, bkpt_from_a32 as unsafe extern "C" fn() as usize
         );
     }
 

examples/mps3-an536/src/bin/prefetch-exception-t32.rs

@@ -63,15 +63,15 @@ unsafe fn prefetch_abort_handler(addr: usize) -> usize {
     let ifar = Ifar::read();
     println!("IFAR (Faulting Address Register): {:?}", ifar);
 
-    if (addr + 1) == bkpt_from_t32 as usize {
+    if (addr + 1) == bkpt_from_t32 as unsafe extern "C" fn() as usize {
         // note that thumb functions have their LSB set, despite always being a
         // multiple of two - that's how the CPU knows they are written in T32
         // machine code.
         println!("caught bkpt_from_t32");
     } else {
         println!(
             "Bad fault address {:08x} is not {:08x}",
-            addr, bkpt_from_t32 as usize
+            addr, bkpt_from_t32 as unsafe extern "C" fn() as usize
         );
     }
 

examples/mps3-an536/src/bin/undef-exception-a32.rs

@@ -55,12 +55,12 @@ fn prefetch_abort_handler(_addr: usize) -> ! {
 unsafe fn undefined_handler(addr: usize) -> usize {
     println!("undefined abort occurred");
 
-    if addr == udf_from_a32 as usize {
+    if addr == udf_from_a32 as unsafe extern "C" fn() as usize {
         println!("caught udf_from_a32");
     } else {
         println!(
             "Bad fault address {:08x} is not {:08x}",
-            addr, udf_from_a32 as usize
+            addr, udf_from_a32 as unsafe extern "C" fn() as usize
         );
     }
 

examples/mps3-an536/src/bin/undef-exception-t32.rs

@@ -55,15 +55,15 @@ fn prefetch_abort_handler(_addr: usize) -> ! {
 unsafe fn undefined_handler(addr: usize) -> usize {
     println!("undefined abort occurred");
 
-    if (addr + 1) == udf_from_t32 as usize {
+    if (addr + 1) == udf_from_t32 as unsafe extern "C" fn() as usize {
         // note that thumb functions have their LSB set, despite always being a
         // multiple of two - that's how the CPU knows they are written in T32
         // machine code.
         println!("caught udf_from_t32");
     } else {
         println!(
             "Bad fault address {:08x} is not {:08x}",
-            addr, udf_from_t32 as usize
+            addr, udf_from_t32 as unsafe extern "C" fn() as usize
         );
     }
 

examples/versatileab/src/bin/abt-exception-a32.rs

@@ -88,7 +88,7 @@ unsafe fn data_abort_handler(addr: usize) -> usize {
     enable_alignment_check();
 
     // note the fault isn't at the start of the function
-    let expect_fault_at = unaligned_from_a32 as usize + 8;
+    let expect_fault_at = unaligned_from_a32 as unsafe extern "C" fn() as usize + 8;
 
     if addr == expect_fault_at {
         println!("caught unaligned_from_a32");

examples/versatileab/src/bin/abt-exception-t32.rs

@@ -88,7 +88,7 @@ unsafe fn data_abort_handler(addr: usize) -> usize {
     enable_alignment_check();
 
     // note the fault isn't at the start of the function
-    let expect_fault_at = unaligned_from_t32 as usize + 3;
+    let expect_fault_at = unaligned_from_t32 as unsafe extern "C" fn() as usize + 3;
 
     if addr == expect_fault_at {
         println!("caught unaligned_from_t32");

examples/versatileab/src/bin/prefetch-exception-a32.rs

@@ -68,12 +68,12 @@ unsafe fn prefetch_abort_handler(addr: usize) -> usize {
         let ifar = Ifar::read();
         println!("IFAR (Faulting Address Register): {:?}", ifar);
 
-        if addr == bkpt_from_a32 as usize {
+        if addr == bkpt_from_a32 as unsafe extern "C" fn() as usize {
             println!("caught bkpt_from_a32");
         } else {
             println!(
                 "Bad fault address {:08x} is not {:08x}",
-                addr, bkpt_from_a32 as usize
+                addr, bkpt_from_a32 as unsafe extern "C" fn() as usize
             );
         }
     }

examples/versatileab/src/bin/prefetch-exception-t32.rs

@@ -68,15 +68,15 @@ unsafe fn prefetch_abort_handler(addr: usize) -> usize {
         let ifar = Ifar::read();
         println!("IFAR (Faulting Address Register): {:?}", ifar);
 
-        if (addr + 1) == bkpt_from_t32 as usize {
+        if (addr + 1) == bkpt_from_t32 as unsafe extern "C" fn() as usize {
             // note that thumb functions have their LSB set, despite always being a
             // multiple of two - that's how the CPU knows they are written in T32
             // machine code.
             println!("caught bkpt_from_t32");
         } else {
             println!(
                 "Bad fault address {:08x} is not {:08x}",
-                addr, bkpt_from_t32 as usize
+                addr, bkpt_from_t32 as unsafe extern "C" fn() as usize
             );
         }
     }