less verbose

1 files changed, 4 insertions, 2 deletions

diff --git a/convert2.rb b/convert2.rb
index b3bb3ab..1727a1d 100755
--- a/convert2.rb
+++ b/convert2.rb
@@ -195,6 +195,7 @@ if opts.l
   require 'yaml'
   data = YAML.load_file ARGV[0]
   state = {}
+  canonical = {}
 
   while (line = $stdin.gets)
     line.chomp!
@@ -207,14 +208,15 @@ if opts.l
       end
 
       regname = regname.sub(/^E1000_/, "")
+      regname = canonical[regname] if canonical[regname]
 
       unless data[regname]
         regshort = regname[/^[\w\d_]+/]
-        if (regs = data.keys.select{|i|i.start_with? regname}).empty?
+        if (regs = data.keys.select{|i|i.start_with? regshort}).empty?
           annotation << " (register #{regname} does not exist!)"
           next
         else
-          regname = regs.first 
+          regname = canonical[regname] = regs.first
           annotation << " (interpreted as register #{regname})"
         end
       end