From 94a081e5269036eba0ebdee625e977503fcbf1dc Mon Sep 17 00:00:00 2001 From: pathoswithin Date: Wed, 2 Dec 2015 15:56:46 +0000 Subject: [PATCH] Nope... rollback git-svn-id: svn://kolibrios.org@5947 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/develop/libraries/msgbox/msgbox.asm | 1 - programs/macros.inc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/develop/libraries/msgbox/msgbox.asm b/programs/develop/libraries/msgbox/msgbox.asm index daafdb9ee6..005478763b 100644 --- a/programs/develop/libraries/msgbox/msgbox.asm +++ b/programs/develop/libraries/msgbox/msgbox.asm @@ -3,7 +3,6 @@ public EXPORTS section '.flat' code readable align 16 include '../../../macros.inc' -macro movi arg1,arg2 {mov arg1,arg2} include 'strlen.inc' MB_FIRST_BUT_ID equ 3 ;идентификатор 1-й кнопки на сообщении diff --git a/programs/macros.inc b/programs/macros.inc index eac3ad8aa7..bfa2a1dc0d 100644 --- a/programs/macros.inc +++ b/programs/macros.inc @@ -272,7 +272,7 @@ macro mpack dest, hsrc, lsrc mov dest, (hsrc) shl 16 add dest, lsrc else - movi dest, hsrc + mov dest, hsrc shl dest, 16 add dest, lsrc end if @@ -283,7 +283,7 @@ macro __mov reg,a,b { ; mike.dld if (~a eq)&(~b eq) mpack reg,a,b else if (~a eq)&(b eq) - movi reg,a + mov reg,a end if }