From d9eb353ee4b1512fd06bdb71329b1c2f4f77e1c8 Mon Sep 17 00:00:00 2001
From: Anh <zenpoems@gmail.com>
Date: Tue, 11 Sep 2018 21:14:55 -0400
Subject: [PATCH] Use hex for unknown function names

Former-commit-id: d7088072d69e90e3679e9efc8ce16aecd87c4829
---
 tools/rida/rida.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/rida/rida.cpp b/tools/rida/rida.cpp
index ca253ce7c..98d07a1c7 100644
--- a/tools/rida/rida.cpp
+++ b/tools/rida/rida.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <sstream>
 #include <assert.h>
 #include <set>
 #include <algorithm>
@@ -104,7 +105,10 @@ class CreateFunctions_t
 				assert(func.begin() != func.end());
 				const auto first_range=*(func.begin());
 				const auto startAddr=first_range.first;
-				const auto name=string()+"sub_"+to_string(startAddr);
+				std::stringstream ss;
+				ss << "sub_" << hex << startAddr;
+				const auto name = ss.str();
+
 				functions++;
 				if(funcNames[func]=="")	// destructive test OK, next line sets if empty.
 				{
@@ -399,7 +403,7 @@ class CreateFunctions_t
 				const auto max=*prev(scc.end());
 				const auto size=max.second-min.first;
 		
-				cout<<"Function "<<dec<<i++<<" is "<<hex<<min.first<<" "<<dec<<max.second-min.first<<endl;
+				cout<<"Function "<<dec<<i++<<" (" <<funcNames[scc] << ") is "<<hex<<min.first<<" "<<dec<<max.second-min.first<<endl;
 				const auto usefp=getUseFp(scc);
 
 				outfile<<hex<<"\t"<<min.first<<"\t"<<dec<<size<<"\tFUNC GLOBAL\t"<<funcNames[scc]<<" "<< usefp << endl;
-- 
GitLab