diff --git a/test_regress/t/t_display.pl b/test_regress/t/t_display.pl index f54b434a9..c3c28ffaa 100755 --- a/test_regress/t/t_display.pl +++ b/test_regress/t/t_display.pl @@ -19,11 +19,17 @@ execute ( [0] In top.v.sub2 [0] In top.v.sub2.subblock2 [0] Back \ Quote " -[0] %X=00c %0X=c %0O=14 %B=000001100 -[0] %x=00c %0x=c %0o=14 %b=000001100 +[0] %b=000001100 %0b=1100 %b=00000101010111011101110111100110011001100 %0b=101010111011101110111100110011001100 %b=000001010101111000001001000110100010101100111100000010010001101000101011001111000 %0b=1010101111000001001000110100010101100111100000010010001101000101011001111000 +[0] %B=000001100 %0B=1100 %B=00000101010111011101110111100110011001100 %0B=101010111011101110111100110011001100 %B=000001010101111000001001000110100010101100111100000010010001101000101011001111000 %0B=1010101111000001001000110100010101100111100000010010001101000101011001111000 +[0] %d= 12 %0d=12 %d= 46099320012 %0d=46099320012 +[0] %D= 12 %0D=12 %D= 46099320012 %0D=46099320012 +[0] %h=00c %0h=c %h=00abbbbcccc %0h=abbbbcccc %h=00abc1234567812345678 %0h=abc1234567812345678 +[0] %H=00c %0H=c %H=00abbbbcccc %0H=abbbbcccc %H=00abc1234567812345678 %0H=abc1234567812345678 +[0] %o=014 %0o=14 %o=00527356746314 %0o=527356746314 %o=012570110642547402215053170 %0o=12570110642547402215053170 +[0] %O=014 %0O=14 %O=00527356746314 %0O=527356746314 %O=012570110642547402215053170 %0O=12570110642547402215053170 +[0] %x=00c %0x=c %x=00abbbbcccc %0x=abbbbcccc %x=00abc1234567812345678 %0x=abc1234567812345678 +[0] %X=00c %0X=c %X=00abbbbcccc %0X=abbbbcccc %X=00abc1234567812345678 %0X=abc1234567812345678 [0] %D= 12 %d= 12 %01d=12 %06d=000012 %6d= 12 -[0] %x=00abbbbcccc %0x=abbbbcccc %o=00527356746314 %b=00000101010111011101110111100110011001100 -[0] %x=00abc1234567812345678 %0x=abc1234567812345678 %o=012570110642547402215053170 %b=000001010101111000001001000110100010101100111100000010010001101000101011001111000 [0] %t= 0 %03t= 0 %0t=0 [0] %s=! %s= what! %s= hmmm!1234 diff --git a/test_regress/t/t_display.v b/test_regress/t/t_display.v index ddba4d1c1..f6d3c361f 100644 --- a/test_regress/t/t_display.v +++ b/test_regress/t/t_display.v @@ -9,7 +9,7 @@ module t; reg [31:0] str; initial str = "\000\277\021\n"; reg [47:0] str2; initial str2 = "\000what!"; reg [79:0] str3; initial str3 = "\000hmmm!1234"; - reg [8:0] nine; + reg [8:0] nine; initial nine = 12; sub sub (); sub2 sub2 (); @@ -23,17 +23,29 @@ module t; $display("[%0t] Back \\ Quote \"", $time); // Old bug when \" last on the line. // Display formatting - nine = {3'd0,quad[5:0]}; - $display("[%0t] %%X=%X %%0X=%0X %%0O=%0O %%B=%B", $time, - nine, nine, nine, nine); - $display("[%0t] %%x=%x %%0x=%0x %%0o=%0o %%b=%b", $time, - nine, nine, nine, nine); + $display("[%0t] %%b=%b %%0b=%0b %%b=%b %%0b=%0b %%b=%b %%0b=%0b", $time, + nine, nine, quad, quad, wide, wide); + $display("[%0t] %%B=%B %%0B=%0B %%B=%B %%0B=%0B %%B=%B %%0B=%0B", $time, + nine, nine, quad, quad, wide, wide); + $display("[%0t] %%d=%d %%0d=%0d %%d=%d %%0d=%0d", $time, + nine, nine, quad, quad); + $display("[%0t] %%D=%D %%0D=%0D %%D=%D %%0D=%0D", $time, + nine, nine, quad, quad); + $display("[%0t] %%h=%h %%0h=%0h %%h=%h %%0h=%0h %%h=%h %%0h=%0h", $time, + nine, nine, quad, quad, wide, wide); + $display("[%0t] %%H=%H %%0H=%0H %%H=%H %%0H=%0H %%H=%H %%0H=%0H", $time, + nine, nine, quad, quad, wide, wide); + $display("[%0t] %%o=%o %%0o=%0o %%o=%o %%0o=%0o %%o=%o %%0o=%0o", $time, + nine, nine, quad, quad, wide, wide); + $display("[%0t] %%O=%O %%0O=%0O %%O=%O %%0O=%0O %%O=%O %%0O=%0o", $time, + nine, nine, quad, quad, wide, wide); + $display("[%0t] %%x=%x %%0x=%0x %%x=%x %%0x=%0x %%x=%x %%0x=%0x", $time, + nine, nine, quad, quad, wide, wide); + $display("[%0t] %%X=%X %%0X=%0X %%X=%X %%0X=%0X %%X=%X %%0X=%0X", $time, + nine, nine, quad, quad, wide, wide); + // $display("[%0t] %%D=%D %%d=%d %%01d=%01d %%06d=%06d %%6d=%6d", $time, nine, nine, nine, nine, nine); - $display("[%0t] %%x=%x %%0x=%0x %%o=%o %%b=%b", $time, - quad, quad, quad, quad); - $display("[%0t] %%x=%x %%0x=%0x %%o=%o %%b=%b", $time, - wide, wide, wide, wide); $display("[%0t] %%t=%t %%03t=%03t %%0t=%0t", $time, $time, $time, $time); $display; diff --git a/test_regress/t/t_display_noopt.pl b/test_regress/t/t_display_noopt.pl index cc1e647f7..e39487891 100755 --- a/test_regress/t/t_display_noopt.pl +++ b/test_regress/t/t_display_noopt.pl @@ -22,11 +22,17 @@ execute ( [0] In top.v.sub2 [0] In top.v.sub2.subblock2 [0] Back \ Quote " -[0] %X=00c %0X=c %0O=14 %B=000001100 -[0] %x=00c %0x=c %0o=14 %b=000001100 +[0] %b=000001100 %0b=1100 %b=00000101010111011101110111100110011001100 %0b=101010111011101110111100110011001100 %b=000001010101111000001001000110100010101100111100000010010001101000101011001111000 %0b=1010101111000001001000110100010101100111100000010010001101000101011001111000 +[0] %B=000001100 %0B=1100 %B=00000101010111011101110111100110011001100 %0B=101010111011101110111100110011001100 %B=000001010101111000001001000110100010101100111100000010010001101000101011001111000 %0B=1010101111000001001000110100010101100111100000010010001101000101011001111000 +[0] %d= 12 %0d=12 %d= 46099320012 %0d=46099320012 +[0] %D= 12 %0D=12 %D= 46099320012 %0D=46099320012 +[0] %h=00c %0h=c %h=00abbbbcccc %0h=abbbbcccc %h=00abc1234567812345678 %0h=abc1234567812345678 +[0] %H=00c %0H=c %H=00abbbbcccc %0H=abbbbcccc %H=00abc1234567812345678 %0H=abc1234567812345678 +[0] %o=014 %0o=14 %o=00527356746314 %0o=527356746314 %o=012570110642547402215053170 %0o=12570110642547402215053170 +[0] %O=014 %0O=14 %O=00527356746314 %0O=527356746314 %O=012570110642547402215053170 %0O=12570110642547402215053170 +[0] %x=00c %0x=c %x=00abbbbcccc %0x=abbbbcccc %x=00abc1234567812345678 %0x=abc1234567812345678 +[0] %X=00c %0X=c %X=00abbbbcccc %0X=abbbbcccc %X=00abc1234567812345678 %0X=abc1234567812345678 [0] %D= 12 %d= 12 %01d=12 %06d=000012 %6d= 12 -[0] %x=00abbbbcccc %0x=abbbbcccc %o=00527356746314 %b=00000101010111011101110111100110011001100 -[0] %x=00abc1234567812345678 %0x=abc1234567812345678 %o=012570110642547402215053170 %b=000001010101111000001001000110100010101100111100000010010001101000101011001111000 [0] %t= 0 %03t= 0 %0t=0 [0] %s=! %s= what! %s= hmmm!1234