From 7d1b3066d9f262d9ac8134c8b64fc3b93be294f8 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sun, 21 Nov 1999 13:09:41 +0000
Subject: [PATCH]   * fixed some missed optimizations because 8bit regs were
 not always     taken into account

---
 compiler/csopt386.pas | 24 ++++++++++++++----------
 compiler/popt386.pas  | 10 +++++++---
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/compiler/csopt386.pas b/compiler/csopt386.pas
index d15251742a..1660b3f7d4 100644
--- a/compiler/csopt386.pas
+++ b/compiler/csopt386.pas
@@ -407,6 +407,7 @@ End;
 
 {$ifdef replacereg}
 function FindRegDealloc(reg: tregister; p: pai): boolean;
+{ assumes reg is a 32bit register }
 begin
   findregdealloc := false;
   while assigned(p^.previous) and
@@ -425,6 +426,7 @@ begin
 end;
 
 function regLoadedWithNewValue(reg: tregister; hp: pai): boolean;
+{ assumes reg is a 32bit register }
 var p: paicpu;
 begin
   p := paicpu(hp);
@@ -436,12 +438,9 @@ begin
        (p^.opcode = A_MOVSX) or
        (p^.opcode = A_LEA)) and
       (p^.oper[1].typ = top_reg) and
-      (p^.oper[1].reg = reg) {and
-      (not(p^.oper[0].typ = top_ref) or
-       not RegInRef(p^.oper[1].reg,p^.oper[0].ref^))}) or
+      (Reg32(p^.oper[1].reg) = reg)) or
      ((p^.opcode = A_POP) and
-      (p^.oper[0].reg = reg))) {or
-    findRegDealloc(reg,hp)};
+      (Reg32(p^.oper[0].reg) = reg)));
 end;
 
 Procedure RestoreRegContentsTo(reg: TRegister; const c: TContent; p: pai);
@@ -558,7 +557,8 @@ begin
 end;
 
 function RegReadByInstruction(reg: TRegister; hp: pai): boolean;
-{ assumes p doesn't modify registers implicitely (like div) }
+{ assumes hp doesn't modify registers implicitely (like div) }
+{ and that reg is a 32bit register                           }
 var p: paicpu;
     opCount: byte;
 begin
@@ -577,21 +577,21 @@ begin
     case InsProp[p^.opcode].Ch[opCount] of
       Ch_RWOp1,Ch_ROp1{$ifdef arithopt},Ch_MOp1{$endif}:
         if (p^.oper[0].typ = top_reg) and
-           (p^.oper[0].reg = reg) then
+           (reg32(p^.oper[0].reg) = reg) then
           begin
             RegReadByInstruction := true;
             exit
           end;
       Ch_RWOp2,Ch_ROp2{$ifdef arithopt},Ch_MOp2{$endif}:
         if (p^.oper[1].typ = top_reg) and
-           (p^.oper[1].reg = reg) then
+           (reg32(p^.oper[1].reg) = reg) then
           begin
             RegReadByInstruction := true;
             exit
           end;
       Ch_RWOp3,Ch_ROp3{$ifdef arithopt},Ch_MOp3{$endif}:
         if (p^.oper[2].typ = top_reg) and
-           (p^.oper[2].reg = reg) then
+           (reg32(p^.oper[2].reg) = reg) then
           begin
             RegReadByInstruction := true;
             exit
@@ -1054,7 +1054,11 @@ End.
 
 {
  $Log$
- Revision 1.33  1999-11-20 11:37:03  jonas
+ Revision 1.34  1999-11-21 13:09:41  jonas
+   * fixed some missed optimizations because 8bit regs were not always
+     taken into account
+
+ Revision 1.33  1999/11/20 11:37:03  jonas
    * make cycle works with -dreplacereg (register renaming)! I have not
      tested it yet together with -darithopt, but I don't expect problems
 
diff --git a/compiler/popt386.pas b/compiler/popt386.pas
index ed157099d5..2c8b1e8f73 100644
--- a/compiler/popt386.pas
+++ b/compiler/popt386.pas
@@ -230,7 +230,7 @@ Begin
                          ((hp1^.typ <> ait_label) or
                    { skip unused labels, they're not referenced anywhere }
                           Not(Pai_Label(hp1)^.l^.is_used)) Do
-                     If not(hp1^.typ in [ait_label,ait_align]) Then
+                     If not(hp1^.typ in ([ait_label,ait_align]+skipinstr)) Then
                        Begin
                          AsmL^.Remove(hp1);
                          Dispose(hp1, done);
@@ -1600,7 +1600,7 @@ Begin
                      (Paicpu(hp1)^.oper[1].typ = top_reg) And
                      ((Paicpu(hp1)^.oper[0].ref^.Base = Paicpu(p)^.oper[1].reg) Or
                       (Paicpu(hp1)^.oper[0].ref^.Index = Paicpu(p)^.oper[1].reg)) And
-                     (Paicpu(hp1)^.oper[1].reg = Paicpu(p)^.oper[1].reg) Then
+                     (Reg32(Paicpu(hp1)^.oper[1].reg) = Paicpu(p)^.oper[1].reg) Then
               {mov reg1, reg2
                mov/zx/sx (reg2, ..), reg2      to   mov/zx/sx (reg1, ..), reg2}
                     Begin
@@ -1672,7 +1672,11 @@ End.
 
 {
  $Log$
- Revision 1.69  1999-11-13 19:03:56  jonas
+ Revision 1.70  1999-11-21 13:09:41  jonas
+   * fixed some missed optimizations because 8bit regs were not always
+     taken into account
+
+ Revision 1.69  1999/11/13 19:03:56  jonas
    * don't remove align objects between JMP's and labels
 
  Revision 1.68  1999/11/06 16:24:00  jonas