From aa89182bf5f55404265650497f976f741d7506df Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Sat, 13 Oct 2018 11:34:53 +0000
Subject: [PATCH] Fix compilation with -dEXTDEBUG
git-svn-id: trunk@39923 -
---
compiler/riscv/cgrv.pas | 53 ++++++++++++++++++++++++++++++++++++
compiler/riscv64/hlcgcpu.pas | 2 +-
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/compiler/riscv/cgrv.pas b/compiler/riscv/cgrv.pas
index 7105207c67..1fde6e4e95 100644
--- a/compiler/riscv/cgrv.pas
+++ b/compiler/riscv/cgrv.pas
@@ -90,6 +90,11 @@ unit cgrv;
A_NONE,A_ADD,A_AND,A_DIVU,A_DIV,A_MUL,A_MUL,
A_None,A_None,A_OR,A_SRA,A_SLL,A_SRL,A_SUB,A_XOR,A_None,A_None);
+{$ifdef extdebug}
+ function ref2string(const ref : treference) : string;
+ function cgsize2string(const size : TCgSize) : string;
+ function cgop2string(const op : TOpCg) : String;
+{$endif extdebug}
implementation
@@ -99,6 +104,54 @@ unit cgrv;
symconst,symsym,symtable,fmodule,
rgobj,tgobj,cpupi,procinfo,paramgr;
+{$ifdef extdebug}
+ function ref2string(const ref : treference) : string;
+ begin
+ result := 'base : ' + inttostr(ord(ref.base)) + ' index : ' + inttostr(ord(ref.index)) + ' refaddr : ' + inttostr(ord(ref.refaddr)) + ' offset : ' + inttostr(ref.offset) + ' symbol : ';
+ if (assigned(ref.symbol)) then
+ result := result + ref.symbol.name;
+ end;
+
+ function cgsize2string(const size : TCgSize) : string;
+ const
+ (* TCgSize = (OS_NO,
+ OS_8, OS_16, OS_32, OS_64, OS_128,
+ OS_S8, OS_S16, OS_S32, OS_S64, OS_S128,
+ { single, double, extended, comp, float128 }
+ OS_F32, OS_F64, OS_F80, OS_C64, OS_F128,
+ { multi-media sizes: split in byte, word, dword, ... }
+ { entities, then the signed counterparts }
+ OS_M8, OS_M16, OS_M32, OS_M64, OS_M128, OS_M256, OS_M512,
+ OS_MS8, OS_MS16, OS_MS32, OS_MS64, OS_MS128, OS_MS256, OS_MS512,
+ { multi-media sizes: single-precision floating-point }
+ OS_MF32, OS_MF128, OS_MF256, OS_MF512,
+ { multi-media sizes: double-precision floating-point }
+ OS_MD64, OS_MD128, OS_MD256, OS_MD512); *)
+
+ cgsize_strings : array[TCgSize] of string[8] = (
+ 'OS_NO',
+ 'OS_8', 'OS_16', 'OS_32', 'OS_64', 'OS_128',
+ 'OS_S8', 'OS_S16', 'OS_S32', 'OS_S64', 'OS_S128',
+ 'OS_F32', 'OS_F64', 'OS_F80', 'OS_C64', 'OS_F128',
+ 'OS_M8', 'OS_M16', 'OS_M32', 'OS_M64', 'OS_M128', 'OS_M256', 'OS_M512',
+ 'OS_MS8', 'OS_MS16', 'OS_MS32', 'OS_MS64', 'OS_MS128', 'OS_MS256', 'OS_MS512',
+ 'OS_MF32', 'OS_MF128', 'OS_MF256', 'OS_MF512',
+ 'OS_MD64', 'OS_MD128', 'OS_MD256', 'OS_MD512');
+ begin
+ result := cgsize_strings[size];
+ end;
+
+ function cgop2string(const op : TOpCg) : String;
+ const
+ opcg_strings : array[TOpCg] of string[6] = (
+ 'None', 'Move', 'Add', 'And', 'Div', 'IDiv', 'IMul', 'Mul',
+ 'Neg', 'Not', 'Or', 'Sar', 'Shl', 'Shr', 'Sub', 'Xor', 'Rol', 'Ror'
+ );
+ begin
+ result := opcg_strings[op];
+ end;
+{$endif extdebug}
+
procedure tcgrv.a_call_name(list : TAsmList;const s : string; weak: boolean);
var
diff --git a/compiler/riscv64/hlcgcpu.pas b/compiler/riscv64/hlcgcpu.pas
index 284152a957..88f612a3fb 100644
--- a/compiler/riscv64/hlcgcpu.pas
+++ b/compiler/riscv64/hlcgcpu.pas
@@ -58,7 +58,7 @@ implementation
tmpreg : TRegister;
begin
{$ifdef extdebug}
- list.concat(tai_comment.create(strpnew('a_load_const_subsetreg subsetregsize = ' + cgsize2string(sreg.subsetregsize) + ' subsetsize = ' + cgsize2string(def_cgsize(subsetsize)) + ' startbit = ' + intToStr(sreg.startbit) + ' a = ' + intToStr(a))));
+ list.concat(tai_comment.create(strpnew('a_load_const_subsetreg subsetregsize = ' + cgsize2string(sreg.subsetregsize) + ' subsetsize = ' + cgsize2string(def_cgsize(tosubsetsize)) + ' startbit = ' + ToStr(sreg.startbit) + ' a = ' + ToStr(a))));
{$endif}
{ loading the constant into the lowest bits of a temp register and then inserting is
better than loading some usually large constants and do some masking and shifting on riscv64 }