cxxrtl: improve printing of narrow memories.

diff --git a/backends/cxxrtl/cxxrtl.cc b/backends/cxxrtl/cxxrtl.cc
index 89e58622c28fd4bf3c6029aae0791f95757f1d4a..74e2a28911a147db7bdbb1fe202423a62b58b8c3 100644 (file)
--- a/backends/cxxrtl/cxxrtl.cc
+++ b/backends/cxxrtl/cxxrtl.cc
@@ -726,12 +726,13 @@ struct CxxrtlWorker {
 
        void dump_const_init(const RTLIL::Const &data, int width, int offset = 0, bool fixed_width = false)
        {
+               const int CHUNK_SIZE = 32;
                f << "{";
                while (width > 0) {
-                       const int CHUNK_SIZE = 32;
-                       uint32_t chunk = data.extract(offset, width > CHUNK_SIZE ? CHUNK_SIZE : width).as_int();
+                       int chunk_width = min(width, CHUNK_SIZE);
+                       uint32_t chunk = data.extract(offset, chunk_width).as_int();
                        if (fixed_width)
-                               f << stringf("0x%08xu", chunk);
+                               f << stringf("0x%.*xu", chunk_width / 4, chunk);
                        else
                                f << stringf("%#xu", chunk);
                        if (width > CHUNK_SIZE)