diff --git a/programs/cmp.inc b/programs/cmp.inc deleted file mode 100644 index a5ea74720e..0000000000 --- a/programs/cmp.inc +++ /dev/null @@ -1,47 +0,0 @@ -macro cmpe a, b, c -{ - cmp a, b - je c -} - -macro cmpne a, b, c -{ - cmp a, b - jne c -} - -macro cmpg a, b, c -{ - cmp a, b - jg c -} - -macro cmpl a, b, c -{ - cmp a, b - jl c -} - -macro cmpnl a, b, c -{ - cmp a, b - jnl c -} - -macro cmpng a, b, c -{ - cmp a, b - jng c -} - -macro cmpge a, b, c -{ - cmp a, b - jge c -} - -macro cmple a, b, c -{ - cmp a, b - jle c -} \ No newline at end of file diff --git a/programs/macros.inc b/programs/macros.inc index 1d743fa306..89b9d17a92 100644 --- a/programs/macros.inc +++ b/programs/macros.inc @@ -557,6 +557,14 @@ else end if } +; replaces /programs/cmp.inc +irp cond, e, ne, g, ng, l, nl, ge, le { + macro cmp#cond a, b, c\{ + cmp a, b + j#cond c + \} +} + ; constants ; events diff --git a/programs/system/notify3/notify.asm b/programs/system/notify3/notify.asm index f5e109ca20..43da7a56a9 100644 --- a/programs/system/notify3/notify.asm +++ b/programs/system/notify3/notify.asm @@ -4,7 +4,6 @@ dd 1, @ENTRY, @end, @memory, @stack, @params, 0 include "../../macros.inc" - include "../../cmp.inc" include "../../proc32.inc" include "../../dll.inc" ; include "../../debug.inc" diff --git a/programs/system/notify3/test_ctrl.asm b/programs/system/notify3/test_ctrl.asm index 8a31fa3e42..39e320bd20 100644 --- a/programs/system/notify3/test_ctrl.asm +++ b/programs/system/notify3/test_ctrl.asm @@ -8,7 +8,6 @@ ; include "../../debug.inc" include "../../notify.inc" include "../../string.inc" - include "../../cmp.inc" @entry: mcall 68, 11 @@ -198,4 +197,4 @@ rb 2048 @stack: - @memory: \ No newline at end of file + @memory: diff --git a/programs/system/open/open.asm b/programs/system/open/open.asm index e55dc6e175..bdc3ace6b5 100644 --- a/programs/system/open/open.asm +++ b/programs/system/open/open.asm @@ -15,7 +15,6 @@ include "../../proc32.inc" include "../../macros.inc" include "../../dll.inc" - include "../../cmp.inc" include "../../string.inc" include "../../develop/libraries/box_lib/trunk/box_lib.mac"