paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-06 17:08:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

* do not generate mul instructions if the mul extension is not available

Browse Source 
git-svn-id: trunk@48883 -
This commit is contained in:
florian 2021-03-06 14:23:54 +00:00
parent 3dd6272891
commit c15bb07bf6
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
compiler/riscv/cgrv.pas
View File

@ -258,6 +258,10 @@ unit cgrv;
procedure tcgrv.a_op_reg_reg_reg(list: TAsmList; op: TOpCg; size: tcgsize; src1, src2, dst: tregister);
var
name: String;
pd: tprocdef;
paraloc1, paraloc2: tcgpara;
begin
if op=OP_NOT then
begin
@ -295,6 +299,47 @@ unit cgrv;
end
else
{$endif RISCV64}
if (op in [OP_IMUL,OP_MUL]) and not(CPURV_HAS_MUL in cpu_capabilities[current_settings.cputype]) then
begin
case size of
OS_8:
name:='fpc_mul_byte';
OS_S8:
name:='fpc_mul_shortint';
OS_16:
name:='fpc_mul_word';
OS_S16:
name:='fpc_mul_integer';
OS_32:
name:='fpc_mul_dword';
OS_S32:
name:='fpc_mul_longint';
else
Internalerror(2021030601);
end;
// if check_overflow then
// name:=name+'_checkoverflow';
pd:=search_system_proc(name);
paraloc1.init;
paraloc2.init;
paramanager.getcgtempparaloc(list,pd,1,paraloc1);
paramanager.getcgtempparaloc(list,pd,2,paraloc2);
a_load_reg_cgpara(list,OS_8,src1,paraloc2);
a_load_reg_cgpara(list,OS_8,src2,paraloc1);
paramanager.freecgpara(list,paraloc2);
paramanager.freecgpara(list,paraloc1);
alloccpuregisters(list,R_INTREGISTER,paramanager.get_volatile_registers_int(pocall_default));
a_call_name(list,upper(name),false);
dealloccpuregisters(list,R_INTREGISTER,paramanager.get_volatile_registers_int(pocall_default));
cg.a_reg_alloc(list,NR_FUNCTION_RESULT_REG);
cg.a_load_reg_reg(list,size,size,NR_FUNCTION_RESULT_REG,dst);
cg.a_reg_dealloc(list,NR_FUNCTION_RESULT_REG);
paraloc2.done;
paraloc1.done;
end
else
begin
list.concat(taicpu.op_reg_reg_reg(TOpCG2AsmOp[op],dst,src2,src1));
maybeadjustresult(list,op,size,dst);

4
compiler/riscv/nrvadd.pas
View File

@ -213,9 +213,7 @@ implementation
function trvaddnode.use_mul_helper: boolean;
begin
if not (CPURV_HAS_MUL in cpu_capabilities[current_settings.cputype]) and
(nodetype=muln) and
not(torddef(resultdef).ordtype in [u8bit,s8bit]) then
if (nodetype=muln) and not(CPURV_HAS_MUL in cpu_capabilities[current_settings.cputype]) then
result:=true
else
Result:=inherited use_mul_helper;