diff --git a/README.md b/README.md index 35a3431..efe25ca 100644 --- a/README.md +++ b/README.md @@ -276,7 +276,6 @@ knowledge - how cool is that! | 8b | [Defining](./section_1/structs/defining.md) | [Link](./section_1/structs/defining.pdf) | | 8c | [Using](./section_1/structs/using.md) | [Link](./section_1/structs/using.pdf) | | 9 | [`const`](./section_1/const/README.md) | [Link](./section_1/const/README.pdf) | -| 10 | [Casting](./section_1/casting/README.md) | [Link](./section_1/casting/README.pdf) | ### Section 2 - Floating Point diff --git a/README.pdf b/README.pdf index 6d0e532..a2f8e18 100644 Binary files a/README.pdf and b/README.pdf differ diff --git a/macros/apple-linux-convergence.S b/macros/apple-linux-convergence.S index 8827423..238ae9e 100644 --- a/macros/apple-linux-convergence.S +++ b/macros/apple-linux-convergence.S @@ -148,6 +148,14 @@ main: .macro AASCIZ label, string .p2align 2 \label: .asciz "\string" +<<<<<<< HEAD +.endm + +.macro MOD src_a, src_b, dest, scratch + sdiv \scratch, \src_a, \src_b + msub \dest, \scratch, \src_b, \src_a +======= +>>>>>>> d64aed10129b1011df2b323fee667ec2a5eeab1b .endm .macro MOD src_a, src_b, dest, scratch