--- qemu/roms/seabios/tools/checkrom.py	2018/04/24 17:36:48	1.1.1.1
+++ qemu/roms/seabios/tools/checkrom.py	2018/04/24 17:52:22	1.1.1.2
@@ -29,8 +29,8 @@ def main():
         finalsize = 128*1024
 
     # Sanity checks
-    c16e = syms['code16_end'] + 0xf0000
-    f16e = syms['final_code16_end']
+    c16e = syms['text16_end'] + 0xf0000
+    f16e = syms['final_text16_end']
     if c16e != f16e:
         print "Error!  16bit code moved during linking (0x%x vs 0x%x)" % (
             c16e, f16e)
@@ -39,14 +39,21 @@ def main():
         print "Error!  Code is too big (0x%x vs 0x%x)" % (
             datasize, finalsize)
         sys.exit(1)
+    actualdatasize = f16e - syms['code32flat_start']
+    if datasize != actualdatasize:
+        print "Error!  Unknown extra data (0x%x vs 0x%x)" % (
+            datasize, actualdatasize)
+        sys.exit(1)
 
     # Print statistics
     sizefree = syms['freespace_end'] - syms['freespace_start']
-    size16 = syms['code16_end'] - syms['code16_start']
-    size32 = syms['code32_end'] - syms['code32_start']
-    totalc = size16+size32
-    print "16bit size: %d" % size16
-    print "32bit size: %d" % size32
+    size16 = syms['text16_end'] - syms['data16_start']
+    size32seg = syms['code32seg_end'] - syms['code32seg_start']
+    size32flat = syms['code32flat_end'] - syms['code32flat_start']
+    totalc = size16+size32seg+size32flat
+    print "16bit size:           %d" % size16
+    print "32bit segmented size: %d" % size32seg
+    print "32bit flat size:      %d" % size32flat
     print "Total size: %d  Free space: %d  Percent used: %.1f%% (%dKiB rom)" % (
         totalc, sizefree + finalsize - datasize
         , (totalc / float(finalsize)) * 100.0