From 3d97db7976db9f94c5e354b43a8d09aa6496f4ea Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sat, 22 Mar 2008 11:49:05 +0000
Subject: [PATCH]   + support for subrange types in dwarf (allows proper
 printing of packed     sets of subrange types)

git-svn-id: trunk@10532 -
---
 compiler/dbgdwarf.pas | 77 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 14 deletions(-)

diff --git a/compiler/dbgdwarf.pas b/compiler/dbgdwarf.pas
index 60a7a1d1b0..e0de659095 100644
--- a/compiler/dbgdwarf.pas
+++ b/compiler/dbgdwarf.pas
@@ -1029,7 +1029,10 @@ implementation
 
     procedure TDebugInfoDwarf.appenddef_ord(list:TAsmList;def:torddef);
       var
-        sign: tdwarf_type;
+        basedef      : tdef;
+        sign         : tdwarf_type;
+        signform     : tdwarf_form;
+        fullbytesize : byte;
       begin
         case def.ordtype of
           s8bit,
@@ -1044,21 +1047,67 @@ implementation
               { because otherwise they are interpreted wrongly when used }
               { in a bitpacked record                                    }
               if (def.low<0) then
-                sign:=DW_ATE_signed
+                begin
+                  sign:=DW_ATE_signed;
+                  signform:=DW_FORM_sdata
+                end
               else
-                sign:=DW_ATE_unsigned;
-              { we should generate a subrange type here }
-              if assigned(def.typesym) then
-                append_entry(DW_TAG_base_type,false,[
-                  DW_AT_name,DW_FORM_string,symname(def.typesym)+#0,
-                  DW_AT_encoding,DW_FORM_data1,sign,
-                  DW_AT_byte_size,DW_FORM_data1,def.size
-                  ])
+                begin
+                  sign:=DW_ATE_unsigned;
+                  signform:=DW_FORM_udata
+                end;
+              fullbytesize:=def.size;
+              case fullbytesize of
+                1:
+                  if (sign=DW_ATE_signed) then
+                    basedef:=s8inttype
+                  else
+                    basedef:=u8inttype;
+                2:
+                  if (sign=DW_ATE_signed) then
+                    basedef:=s16inttype
+                  else
+                    basedef:=u16inttype;
+                4:
+                  if (sign=DW_ATE_signed) then
+                    basedef:=s32inttype
+                  else
+                    basedef:=u32inttype;
+                else
+                  internalerror(2008032201);
+              end;
+
+              if (def.low=torddef(basedef).low) and
+                 (def.high=torddef(basedef).high) then
+                { base type such as byte/shortint/word/... }
+                if assigned(def.typesym) then
+                  append_entry(DW_TAG_base_type,false,[
+                    DW_AT_name,DW_FORM_string,symname(def.typesym)+#0,
+                    DW_AT_encoding,DW_FORM_data1,sign,
+                    DW_AT_byte_size,DW_FORM_data1,fullbytesize])
+                else
+                  append_entry(DW_TAG_base_type,false,[
+                    DW_AT_encoding,DW_FORM_data1,sign,
+                    DW_AT_byte_size,DW_FORM_data1,fullbytesize])
               else
-                append_entry(DW_TAG_base_type,false,[
-                  DW_AT_encoding,DW_FORM_data1,sign,
-                  DW_AT_byte_size,DW_FORM_data1,def.size
-                  ]);
+                begin
+                  { subrange type }
+                  { note: don't do this 64 bit int types, they appear    }
+                  {       to be always clipped to s32bit for some reason }
+                  if assigned(def.typesym) then
+                    append_entry(DW_TAG_subrange_type,false,[
+                      DW_AT_name,DW_FORM_string,symname(def.typesym)+#0,
+                      DW_AT_lower_bound,signform,int64(def.low),
+                      DW_AT_upper_bound,signform,int64(def.high)
+                      ])
+                  else
+                    append_entry(DW_TAG_subrange_type,false,[
+                      DW_AT_lower_bound,signform,int64(def.low),
+                      DW_AT_upper_bound,signform,int64(def.high)
+                      ]);
+                  append_labelentry_ref(DW_AT_type,def_dwarf_lab(basedef));
+                end;
+                
               finish_entry;
             end;
           uvoid :