mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-17 07:19:14 +02:00
+ case statement for int64/qword implemented
This commit is contained in:
florian
parent
797102a0a1
commit
cd6180fe99
@ -34,7 +34,7 @@ interface
|
||||
implementation
|
||||
|
||||
uses
|
||||
globtype,systems,
|
||||
globtype,systems,cpuinfo,
|
||||
cobjects,verbose,globals,
|
||||
symconst,symtable,aasm,types,
|
||||
hcodegen,temp_gen,pass_2,
|
||||
@ -42,7 +42,7 @@ implementation
|
||||
cgai386,tgeni386;
|
||||
|
||||
const
|
||||
bytes2Sxx:array[1..4] of Topsize=(S_B,S_W,S_NO,S_L);
|
||||
bytes2Sxx:array[1..8] of Topsize=(S_B,S_W,S_NO,S_L,S_NO,S_NO,S_NO,S_Q);
|
||||
|
||||
{*****************************************************************************
|
||||
SecondSetElement
|
||||
@ -529,14 +529,14 @@ implementation
|
||||
jmp_gt,jmp_le,jmp_lee : tasmcond;
|
||||
hp : ptree;
|
||||
{ register with case expression }
|
||||
hregister : tregister;
|
||||
hregister,hregister2 : tregister;
|
||||
endlabel,elselabel : pasmlabel;
|
||||
|
||||
{ true, if we can omit the range check of the jump table }
|
||||
jumptable_no_range : boolean;
|
||||
{ where to put the jump table }
|
||||
jumpsegment : paasmoutput;
|
||||
min_label : longint;
|
||||
min_label : TConstExprInt;
|
||||
|
||||
procedure gentreejmp(p : pcaserecord);
|
||||
|
||||
@ -586,18 +586,33 @@ implementation
|
||||
|
||||
var
|
||||
first : boolean;
|
||||
last : longint;
|
||||
last : TConstExprInt;
|
||||
|
||||
procedure genitem(t : pcaserecord);
|
||||
|
||||
var
|
||||
l1 : pasmlabel;
|
||||
|
||||
begin
|
||||
if assigned(t^.less) then
|
||||
genitem(t^.less);
|
||||
if t^._low=t^._high then
|
||||
begin
|
||||
if opsize=S_Q then
|
||||
begin
|
||||
getlabel(l1);
|
||||
emit_const_reg(A_CMP,S_L,hi(int64(t^._low)),hregister2);
|
||||
emitjmp(C_NZ,l1);
|
||||
emit_const_reg(A_CMP,S_L,lo(int64(t^._low)),hregister);
|
||||
emitjmp(C_Z,t^.statement);
|
||||
emitlab(l1);
|
||||
end
|
||||
else
|
||||
begin
|
||||
emit_const_reg(A_CMP,opsize,t^._low,hregister);
|
||||
emitjmp(C_Z,t^.statement);
|
||||
last:=t^._low;
|
||||
end;
|
||||
end
|
||||
else
|
||||
begin
|
||||
@ -605,13 +620,41 @@ implementation
|
||||
{ present label then the lower limit can be checked }
|
||||
{ immediately. else check the range in between: }
|
||||
if first or (t^._low-last>1) then
|
||||
begin
|
||||
if opsize=S_Q then
|
||||
begin
|
||||
getlabel(l1);
|
||||
emit_const_reg(A_CMP,S_L,hi(int64(t^._low)),hregister2);
|
||||
emitjmp(jmp_le,elselabel);
|
||||
emitjmp(jmp_gt,l1);
|
||||
emit_const_reg(A_CMP,S_L,lo(int64(t^._low)),hregister);
|
||||
{ the comparisation of the low dword must be always unsigned! }
|
||||
emitjmp(C_B,elselabel);
|
||||
emitlab(l1);
|
||||
end
|
||||
else
|
||||
begin
|
||||
emit_const_reg(A_CMP,opsize,t^._low,hregister);
|
||||
emitjmp(jmp_le,elselabel);
|
||||
end;
|
||||
end;
|
||||
|
||||
if opsize=S_Q then
|
||||
begin
|
||||
getlabel(l1);
|
||||
emit_const_reg(A_CMP,S_L,hi(int64(t^._high)),hregister2);
|
||||
emitjmp(jmp_le,t^.statement);
|
||||
emitjmp(jmp_gt,l1);
|
||||
emit_const_reg(A_CMP,S_L,lo(int64(t^._high)),hregister);
|
||||
{ the comparisation of the low dword must be always unsigned! }
|
||||
emitjmp(C_BE,t^.statement);
|
||||
emitlab(l1);
|
||||
end
|
||||
else
|
||||
begin
|
||||
emit_const_reg(A_CMP,opsize,t^._high,hregister);
|
||||
emitjmp(jmp_lee,t^.statement);
|
||||
end;
|
||||
|
||||
last:=t^._high;
|
||||
end;
|
||||
@ -631,7 +674,7 @@ implementation
|
||||
|
||||
var
|
||||
first : boolean;
|
||||
last : longint;
|
||||
last : TConstExprInt;
|
||||
{helplabel : longint;}
|
||||
|
||||
procedure genitem(t : pcaserecord);
|
||||
@ -692,7 +735,7 @@ implementation
|
||||
|
||||
begin
|
||||
{ do we need to generate cmps? }
|
||||
if with_sign and (min_label<0) then
|
||||
if (with_sign and (min_label<0)) then
|
||||
genlinearcmplist(hp)
|
||||
else
|
||||
begin
|
||||
@ -707,7 +750,7 @@ implementation
|
||||
|
||||
var
|
||||
table : pasmlabel;
|
||||
last : longint;
|
||||
last : TConstExprInt;
|
||||
hr : preference;
|
||||
|
||||
procedure genitem(t : pcaserecord);
|
||||
@ -788,6 +831,8 @@ implementation
|
||||
{$else Delphi}
|
||||
dist : dword;
|
||||
{$endif Delphi}
|
||||
hr : preference;
|
||||
|
||||
begin
|
||||
getlabel(endlabel);
|
||||
getlabel(elselabel);
|
||||
@ -824,7 +869,15 @@ implementation
|
||||
{ copy the case expression to a register }
|
||||
case p^.left^.location.loc of
|
||||
LOC_REGISTER:
|
||||
begin
|
||||
if opsize=S_Q then
|
||||
begin
|
||||
hregister:=p^.left^.location.registerlow;
|
||||
hregister2:=p^.left^.location.registerhigh;
|
||||
end
|
||||
else
|
||||
hregister:=p^.left^.location.register;
|
||||
end;
|
||||
LOC_FLAGS :
|
||||
begin
|
||||
locflags2reg(p^.left^.location,opsize);
|
||||
@ -839,19 +892,45 @@ implementation
|
||||
begin
|
||||
hregister:=getregister32;
|
||||
case opsize of
|
||||
S_B : hregister:=reg32toreg8(hregister);
|
||||
S_W : hregister:=reg32toreg16(hregister);
|
||||
S_B:
|
||||
hregister:=reg32toreg8(hregister);
|
||||
S_W:
|
||||
hregister:=reg32toreg16(hregister);
|
||||
S_Q:
|
||||
hregister2:=R_EDI;
|
||||
end;
|
||||
if opsize=S_Q then
|
||||
begin
|
||||
emit_reg_reg(A_MOV,S_L,p^.left^.location.registerlow,hregister);
|
||||
hr:=newreference(p^.left^.location.reference);
|
||||
inc(hr^.offset,4);
|
||||
emit_reg_reg(A_MOV,S_L,p^.left^.location.registerhigh,hregister2);
|
||||
end
|
||||
else
|
||||
emit_reg_reg(A_MOV,opsize,
|
||||
p^.left^.location.register,hregister);
|
||||
end;
|
||||
LOC_MEM,LOC_REFERENCE : begin
|
||||
LOC_MEM,LOC_REFERENCE:
|
||||
begin
|
||||
del_reference(p^.left^.location.reference);
|
||||
hregister:=getregister32;
|
||||
case opsize of
|
||||
S_B : hregister:=reg32toreg8(hregister);
|
||||
S_W : hregister:=reg32toreg16(hregister);
|
||||
S_B:
|
||||
hregister:=reg32toreg8(hregister);
|
||||
S_W:
|
||||
hregister:=reg32toreg16(hregister);
|
||||
S_Q:
|
||||
hregister2:=R_EDI;
|
||||
end;
|
||||
if opsize=S_Q then
|
||||
begin
|
||||
emit_ref_reg(A_MOV,S_L,newreference(
|
||||
p^.left^.location.reference),hregister);
|
||||
hr:=newreference(p^.left^.location.reference);
|
||||
inc(hr^.offset,4);
|
||||
emit_ref_reg(A_MOV,S_L,hr,hregister2);
|
||||
end
|
||||
else
|
||||
emit_ref_reg(A_MOV,opsize,newreference(
|
||||
p^.left^.location.reference),hregister);
|
||||
end;
|
||||
@ -861,6 +940,10 @@ implementation
|
||||
{ cmps and subs/decs }
|
||||
min_label:=case_get_min(p^.nodes);
|
||||
{ now generate the jumps }
|
||||
if opsize=S_Q then
|
||||
genlinearcmplist(p^.nodes)
|
||||
else
|
||||
begin
|
||||
if cs_optimize in aktglobalswitches then
|
||||
begin
|
||||
{ procedures are empirically passed on }
|
||||
@ -940,8 +1023,9 @@ implementation
|
||||
else
|
||||
{ it's always not bad }
|
||||
genlinearlist(p^.nodes);
|
||||
ungetregister(hregister);
|
||||
end;
|
||||
|
||||
ungetregister(hregister);
|
||||
|
||||
{ now generate the instructions }
|
||||
hp:=p^.right;
|
||||
@ -968,7 +1052,10 @@ implementation
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.5 2000-08-05 09:57:27 jonas
|
||||
Revision 1.6 2000-08-12 06:47:56 florian
|
||||
+ case statement for int64/qword implemented
|
||||
|
||||
Revision 1.5 2000/08/05 09:57:27 jonas
|
||||
* added missing register deallocation (could cause IE10 i some cases)
|
||||
(merged from fixes branch)
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ unit pstatmnt;
|
||||
|
||||
uses
|
||||
globtype,systems,tokens,
|
||||
strings,cobjects,globals,files,verbose,
|
||||
strings,cobjects,globals,files,verbose,cpuinfo,
|
||||
symconst,symtable,aasm,pass_1,types,scanner,
|
||||
{$ifdef newcg}
|
||||
cgbase,
|
||||
@ -188,8 +188,9 @@ unit pstatmnt;
|
||||
|
||||
var
|
||||
code,caseexpr,p,instruc,elseblock : ptree;
|
||||
hl1,hl2 : longint;
|
||||
hl1,hl2 : TConstExprInt;
|
||||
casedeferror : boolean;
|
||||
|
||||
begin
|
||||
consume(_CASE);
|
||||
caseexpr:=comp_expr(true);
|
||||
@ -199,7 +200,7 @@ unit pstatmnt;
|
||||
casedeferror:=false;
|
||||
casedef:=caseexpr^.resulttype;
|
||||
if (not assigned(casedef)) or
|
||||
not(is_ordinal(casedef) or is_64bitint(casedef)) then
|
||||
not(is_ordinal(casedef)) then
|
||||
begin
|
||||
CGMessage(type_e_ordinal_expr_expected);
|
||||
{ create a correct tree }
|
||||
@ -1380,7 +1381,10 @@ unit pstatmnt;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.3 2000-07-13 12:08:27 michael
|
||||
Revision 1.4 2000-08-12 06:46:06 florian
|
||||
+ case statement for int64/qword implemented
|
||||
|
||||
Revision 1.3 2000/07/13 12:08:27 michael
|
||||
+ patched to 1.1.0 with former 1.09patch from peter
|
||||
|
||||
Revision 1.2 2000/07/13 11:32:45 michael
|
||||
|
||||
@ -317,6 +317,8 @@ implementation
|
||||
t_times:=old_t_times;
|
||||
|
||||
{ there is one register required for the case expression }
|
||||
{ for 64 bit ints we cheat: the high dword is stored in EDI }
|
||||
{ so we don't need an extra register }
|
||||
if p^.registers32<1 then p^.registers32:=1;
|
||||
end;
|
||||
|
||||
@ -324,7 +326,10 @@ implementation
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.2 2000-07-13 11:32:52 michael
|
||||
Revision 1.3 2000-08-12 06:46:26 florian
|
||||
+ case statement for int64/qword implemented
|
||||
|
||||
Revision 1.2 2000/07/13 11:32:52 michael
|
||||
+ removed logs
|
||||
|
||||
}
|
||||
@ -28,7 +28,7 @@ unit tree;
|
||||
interface
|
||||
|
||||
uses
|
||||
globtype,cobjects
|
||||
globtype,cobjects,cpuinfo
|
||||
{$IFDEF NEWST}
|
||||
,objects,symtable,symbols,defs
|
||||
{$ELSE}
|
||||
@ -167,7 +167,7 @@ unit tree;
|
||||
tcaserecord = record
|
||||
|
||||
{ range }
|
||||
_low,_high : longint;
|
||||
_low,_high : TConstExprInt;
|
||||
|
||||
{ only used by gentreejmp }
|
||||
_at : pasmlabel;
|
||||
@ -2133,7 +2133,10 @@ unit tree;
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.4 2000-08-06 19:39:28 peter
|
||||
Revision 1.5 2000-08-12 06:46:51 florian
|
||||
+ case statement for int64/qword implemented
|
||||
|
||||
Revision 1.4 2000/08/06 19:39:28 peter
|
||||
* default parameters working !
|
||||
|
||||
Revision 1.3 2000/08/04 22:00:52 peter
|
||||
|
||||
@ -1067,8 +1067,8 @@ implementation
|
||||
{ range checking for case statements is done with testrange }
|
||||
case porddef(def1)^.typ of
|
||||
u8bit,u16bit,u32bit,
|
||||
s8bit,s16bit,s32bit :
|
||||
is_subequal:=(porddef(def2)^.typ in [s32bit,u32bit,u8bit,s8bit,s16bit,u16bit]);
|
||||
s8bit,s16bit,s32bit,s64bit,u64bit :
|
||||
is_subequal:=(porddef(def2)^.typ in [s64bit,u64bit,s32bit,u32bit,u8bit,s8bit,s16bit,u16bit]);
|
||||
bool8bit,bool16bit,bool32bit :
|
||||
is_subequal:=(porddef(def2)^.typ in [bool8bit,bool16bit,bool32bit]);
|
||||
uchar :
|
||||
@ -1130,7 +1130,10 @@ implementation
|
||||
end.
|
||||
{
|
||||
$Log$
|
||||
Revision 1.4 2000-08-08 19:26:41 peter
|
||||
Revision 1.5 2000-08-12 06:49:22 florian
|
||||
+ case statement for int64/qword implemented
|
||||
|
||||
Revision 1.4 2000/08/08 19:26:41 peter
|
||||
* equal_constsym() needed for default para
|
||||
|
||||
Revision 1.3 2000/07/13 12:08:28 michael
|
||||
|
||||
Loading…
Reference in New Issue
Block a user