diff mbox

[avr,5,+,trunk,committed] : Fix "KiB" diagnostic for wrong address space.

Message ID 55D5E52B.1040904@gjlay.de
State New
Headers show

Commit Message

Georg-Johann Lay Aug. 20, 2015, 2:33 p.m. UTC 
https://gcc.gnu.org/r227034
https://gcc.gnu.org/r227035

If an address space is used that's beyond the flash of the current device 
(number of 64 KiB segments as specified by -mn-flash=) a diagnostic complains 
and prints the currently specified numbers of flash segments, i.e. 64 KiB 
chunks, and used "KiB" as unit.  Hence the avr_n_flash number of segments has 
to be multiplied by 64 in order to convert from number of segments to KiB.

Applied as obvious to trunk and gcc-5-branch (4.9 does not print the size).


Johann
diff mbox

Patch

Index: config/avr/avr.c
===================================================================
--- config/avr/avr.c    (revision 227034)
+++ config/avr/avr.c    (revision 227035)
@@ -9255,10 +9255,10 @@  avr_pgm_check_var_decl (tree node)
          {
            if (TYPE_P (node))
              error ("%qT uses address space %qs beyond flash of %d KiB",
-                   node, avr_addrspace[as].name, avr_n_flash);
+                   node, avr_addrspace[as].name, 64 * avr_n_flash);
            else
              error ("%s %q+D uses address space %qs beyond flash of %d KiB",
-                   reason, node, avr_addrspace[as].name, avr_n_flash);
+                   reason, node, avr_addrspace[as].name, 64 * avr_n_flash);
          }
        else
          {
@@ -9305,7 +9305,7 @@  avr_insert_attributes (tree node, tree *
        if (avr_addrspace[as].segment >= avr_n_flash)
          {
            error ("variable %q+D located in address space %qs beyond flash "
-                 "of %d KiB", node, avr_addrspace[as].name, avr_n_flash);
+                 "of %d KiB", node, avr_addrspace[as].name, 64 * avr_n_flash);
          }
        else if (!AVR_HAVE_LPM && avr_addrspace[as].pointer_size > 2)
         {