From a8d496ade781502600a6bf75d509a202a8bd38a5 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Fri, 29 Mar 2024 20:54:52 +0100
Subject: [PATCH]   * i386 uses generic x86 abs(long/int64) code now

---
 compiler/i386/n386inl.pas | 32 --------------------------------
 compiler/x86/nx86inl.pas  |  4 +++-
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/compiler/i386/n386inl.pas b/compiler/i386/n386inl.pas
index 829f4cfb55..728536b60f 100644
--- a/compiler/i386/n386inl.pas
+++ b/compiler/i386/n386inl.pas
@@ -33,7 +33,6 @@ interface
        public
          function first_sar: tnode; override;
          procedure second_rox_sar; override;
-         procedure second_abs_long; override;
        end;
 
 implementation
@@ -121,37 +120,6 @@ implementation
         inherited second_rox_sar;
     end;
 
-
-  procedure ti386inlinenode.second_abs_long;
-    var
-      hl: TAsmLabel;
-    begin
-      if is_64bitint(left.resultdef) then
-        begin
-          secondpass(left);
-          hlcg.location_force_reg(current_asmdata.CurrAsmList,left.location,left.resultdef,left.resultdef,false);
-          location:=left.location;
-          location.register64.reglo:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
-          location.register64.reghi:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
-          cg64.a_load64_reg_reg(current_asmdata.CurrAsmList,left.location.register64,location.register64);
-          cg.a_op_const_reg(current_asmdata.CurrAsmList,OP_SAR,OS_32,31,left.location.register64.reghi);
-          cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_XOR,OS_32,left.location.register64.reghi,location.register64.reglo);
-          cg.a_op_reg_reg(current_asmdata.CurrAsmList,OP_XOR,OS_32,left.location.register64.reghi,location.register64.reghi);
-          emit_reg_reg(A_SUB,S_L,left.location.register64.reghi,location.register64.reglo);
-          emit_reg_reg(A_SBB,S_L,left.location.register64.reghi,location.register64.reghi);
-          if cs_check_overflow in current_settings.localswitches then
-            begin
-              current_asmdata.getjumplabel(hl);
-              cg.a_jmp_flags(current_asmdata.CurrAsmList,F_NO,hl);
-              cg.a_call_name(current_asmdata.CurrAsmList,'FPC_OVERFLOW',false);
-              cg.a_label(current_asmdata.CurrAsmList,hl);
-            end;
-        end
-      else
-        inherited second_abs_long;
-    end;
-
-
 begin
    cinlinenode:=ti386inlinenode;
 end.
diff --git a/compiler/x86/nx86inl.pas b/compiler/x86/nx86inl.pas
index 2e5595dfa1..df3c9b907b 100644
--- a/compiler/x86/nx86inl.pas
+++ b/compiler/x86/nx86inl.pas
@@ -1094,7 +1094,9 @@ implementation
         hl: TAsmLabel;
       begin
 {$if defined(i8086) or defined(i386)}
-        if not(CPUX86_HAS_CMOV in cpu_capabilities[current_settings.cputype]) then
+        if is_64bitint(resultdef) then
+          inherited
+        else if not(CPUX86_HAS_CMOV in cpu_capabilities[current_settings.cputype]) then
           begin
             opsize:=def_cgsize(left.resultdef);
             secondpass(left);