XeLabs/asm_book
2
0
Fork 0
mirror of https://github.com/pkivolowitz/asm_book.git synced 2026-06-21 02:26:59 +08:00
Code Issues Projects Releases Packages Wiki Activity

merge problem

Browse source
This commit is contained in:
Perry Kivolowitz 2023-03-31 09:44:29 -05:00
parent add0e3e448
commit b4199955ed
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
macros/apple-linux-convergence.S
View file

@ -148,14 +148,6 @@ main:
.macro AASCIZ label, string .macro AASCIZ label, string
.p2align 2 .p2align 2
\label: .asciz "\string" \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 .endm
.macro MOD src_a, src_b, dest, scratch .macro MOD src_a, src_b, dest, scratch