From 73c897ac69c4ada45fb2fc407f8eb5b5da4d408e Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Wed, 20 Sep 2006 13:24:18 +0000
Subject: [PATCH] Fix printf ULL warnings with a cast.

git-svn-id: file://localhost/svn/verilator/trunk/verilator@790 77ca24e4-aefa-0310-84f0-b9a241c72d87
---
 Changes         |  2 ++
 src/V3EmitC.cpp | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 25bdbd7d6..be2548a7a 100644
--- a/Changes
+++ b/Changes
@@ -13,6 +13,8 @@ indicates the contributor was also the author of the fix; Thanks!
 
 **** Fix DOS carrage returns in multiline defines.  [Ralf Karge]
 
+**** Fix printf format warnings on 64-bit linux.
+
 * Verilator 3.602 09/11/2006
 
 **** Fix function references under top inlined module.  [David Hewson]
diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp
index ee854ea08..3afc585c7 100644
--- a/src/V3EmitC.cpp
+++ b/src/V3EmitC.cpp
@@ -909,7 +909,6 @@ string EmitCStmts::displayFormat(AstNode* widthNodep, string in,
     } else {
 	fmt=in;
     }
-    if (widthNodep->isQuad() && fmtLetter!='c' && fmtLetter!='s' && !reallyString) fmt+="ll";
     return fmt;
 }
 
@@ -940,10 +939,20 @@ void EmitCStmts::displayArg(AstDisplay* dispp, AstNode** elistp, string fmt, cha
 	emitDispState.pushFormat(pfmt);
 	emitDispState.pushArg(*elistp,func);
     } else {
+	string func;
 	string nfmt = displayFormat(*elistp, fmt, fmtLetter, true, false);
+	if ((*elistp)->isQuad() && (fmtLetter=='d')) {
+	    nfmt+="ll";
+	    func="(long long)(";  // Must match %ll to avoid warnings
+	}
+	if ((*elistp)->isQuad() && (fmtLetter=='u'||fmtLetter=='o'||fmtLetter=='x')) {
+	    nfmt+="ll";
+	    func="(unsigned long long)(";  // Must match %ull to avoid warnings
+	}
 	string pfmt = "%"+nfmt+fmtLetter;
+
 	emitDispState.pushFormat(pfmt);
-	emitDispState.pushArg(*elistp,"");
+	emitDispState.pushArg(*elistp,func);
     }
     // Next parameter
     *elistp = (*elistp)->nextp();