fixed zero-alignment bug 1st field in the register

cea56bbe · Tomasz Wlostowski · 4aea82ba · cea56bbe · cea56bbe
Commit cea56bbe authored Dec 04, 2013 by Tomasz Wlostowski
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 323 additions and 307 deletions

wbgen2 wbgen2 +312 -306

wbgen_common.lua wbgen_common.lua +11 -1

No files found.
--- a/wbgen2
+++ b/wbgen2
--- a/wbgen_common.lua
+++ b/wbgen_common.lua
@@ -192,8 +192,17 @@ function align(field, offset)
 -- no alignment defined? just assume it's 1
  if(field.align == nil) then a=1; else a=field.align; end 

+  local newofs;
+
+	if (offset == 0 and field.align ~= nil) then
+		newofs = field.align;
+	else
+		newofs = a  * math.floor((offset + a - 1) / a);
+	end
+		
 -- calculate the aligned offset    
-  local newofs = a  * math.floor((offset + a - 1) / a);
+
+	print("Align  ", field.name, field.align, offset, newofs);

  return newofs;
 end
@@ -205,6 +214,7 @@ function calc_field_offset(field, reg)
 -- align the field offset next to the current offset in the reg
 	 local ofs = reg.current_offset;

+
 -- FIFOs can span multiple I/O registers.
 	 if (reg.__type == TYPE_FIFO) then