From c6d00a2b1fdd31379153da547a5500d5e37cb3bb Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Wed, 7 Jul 2010 18:45:57 +0000
Subject: [PATCH]   * correct the register size holding a smallset < 4 bytes
 when using "bt"     on it (mantis #16861)   * fixed some indentation

git-svn-id: trunk@15531 -
---
 .gitattributes           |  1 +
 compiler/x86/nx86set.pas | 36 +++++++++++++++++++-----------------
 tests/webtbs/tw16861.pp  | 14 ++++++++++++++
 3 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 tests/webtbs/tw16861.pp

diff --git a/.gitattributes b/.gitattributes
index 9b0a234f92..777726da30 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10525,6 +10525,7 @@ tests/webtbs/tw16787.pp svneol=native#text/plain
 tests/webtbs/tw16803.pp svneol=native#text/plain
 tests/webtbs/tw1681.pp svneol=native#text/plain
 tests/webtbs/tw16820.pp svneol=native#text/plain
+tests/webtbs/tw16861.pp svneol=native#text/plain
 tests/webtbs/tw1696.pp svneol=native#text/plain
 tests/webtbs/tw1699.pp svneol=native#text/plain
 tests/webtbs/tw1709.pp svneol=native#text/plain
diff --git a/compiler/x86/nx86set.pas b/compiler/x86/nx86set.pas
index 8f1b93d594..780a0e5b8a 100644
--- a/compiler/x86/nx86set.pas
+++ b/compiler/x86/nx86set.pas
@@ -446,22 +446,22 @@ implementation
                           cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_32,right.location.value,hreg2);
                           emit_reg_reg(A_BT,S_L,hreg,hreg2);
                        end;
-                  else
-                    begin
-                       emit_const_ref(A_CMP,TCGSize2OpSize[orgopsize],31,left.location.reference);
-                       cg.a_jmp_flags(current_asmdata.CurrAsmList,F_BE,l);
-                       { reset carry flag }
-                       current_asmdata.CurrAsmList.concat(taicpu.op_none(A_CLC,S_NO));
-                       cg.a_jmp_always(current_asmdata.CurrAsmList,l2);
-                       cg.a_label(current_asmdata.CurrAsmList,l);
-                       hreg:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
-                       cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_32,OS_32,left.location.reference,hreg);
-                       { We have to load the value into a register because
-                         btl does not accept values only refs or regs (PFV) }
-                       hreg2:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
-                       cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_32,right.location.value,hreg2);
-                       emit_reg_reg(A_BT,S_L,hreg,hreg2);
-                    end;
+                     else
+                       begin
+                          emit_const_ref(A_CMP,TCGSize2OpSize[orgopsize],31,left.location.reference);
+                          cg.a_jmp_flags(current_asmdata.CurrAsmList,F_BE,l);
+                          { reset carry flag }
+                          current_asmdata.CurrAsmList.concat(taicpu.op_none(A_CLC,S_NO));
+                          cg.a_jmp_always(current_asmdata.CurrAsmList,l2);
+                          cg.a_label(current_asmdata.CurrAsmList,l);
+                          hreg:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
+                          cg.a_load_ref_reg(current_asmdata.CurrAsmList,OS_32,OS_32,left.location.reference,hreg);
+                          { We have to load the value into a register because
+                            btl does not accept values only refs or regs (PFV) }
+                          hreg2:=cg.getintregister(current_asmdata.CurrAsmList,OS_32);
+                          cg.a_load_const_reg(current_asmdata.CurrAsmList,OS_32,right.location.value,hreg2);
+                          emit_reg_reg(A_BT,S_L,hreg,hreg2);
+                       end;
                   end;
                   cg.a_label(current_asmdata.CurrAsmList,l2);
                 end { of right.location.loc=LOC_CONSTANT }
@@ -491,7 +491,9 @@ implementation
                else
                 begin
                   location_force_reg(current_asmdata.CurrAsmList,left.location,opsize,false);
-                    register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase);
+                  register_maybe_adjust_setbase(current_asmdata.CurrAsmList,left.location,setbase);
+                  if (right.location.loc in [LOC_REGISTER,LOC_CREGISTER]) then
+                    location_force_reg(current_asmdata.CurrAsmList,right.location,opsize,true);
                   pleftreg:=left.location.register;
 
                   if (opsize >= OS_S8) or { = if signed }
diff --git a/tests/webtbs/tw16861.pp b/tests/webtbs/tw16861.pp
new file mode 100644
index 0000000000..f1dedb97b3
--- /dev/null
+++ b/tests/webtbs/tw16861.pp
@@ -0,0 +1,14 @@
+(*$packset 1 *)
+program test;
+var
+  s8: set of 0..7;
+  b: byte;
+begin
+  b:=17;
+  s8:=[];
+  if b in (s8+[1]) then
+    halt(1);
+  b:=5;
+  if not(b in (s8+[5])) then
+    halt(2);
+end.