From d8d457ce74743f067ba9c536c174f098170308ce Mon Sep 17 00:00:00 2001
From: ValKmjolnir <lhk101lhk101@qq.com>
Date: Sat, 16 Jul 2022 18:47:27 +0800
Subject: [PATCH] :bug: fix information print format on MSVC.

---
 nasal_builtin.h |  8 ++++----
 nasal_vm.h      | 51 +++++++++++++++++++++++++++----------------------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/nasal_builtin.h b/nasal_builtin.h
index fbf81cf..742cce3 100644
--- a/nasal_builtin.h
+++ b/nasal_builtin.h
@@ -368,12 +368,12 @@ nasal_ref builtin_rand(nasal_ref* local,nasal_gc& gc)
 nasal_ref builtin_id(nasal_ref* local,nasal_gc& gc)
 {
     nasal_ref val=local[1];
-    char buf[32];
+    std::stringstream ss;
     if(val.type>vm_num)
-        sprintf(buf,"%p",val.value.gcobj);
+        ss<<"0x"<<std::hex<<(uint64_t)val.value.gcobj<<std::dec;
     else
-        sprintf(buf,"0");
-    return gc.newstr(buf);
+        ss<<"0";
+    return gc.newstr(ss.str());
 }
 nasal_ref builtin_int(nasal_ref* local,nasal_gc& gc)
 {
diff --git a/nasal_vm.h b/nasal_vm.h
index e398060..ac442b8 100644
--- a/nasal_vm.h
+++ b/nasal_vm.h
@@ -164,27 +164,32 @@ void nasal_vm::valinfo(nasal_ref& val)
         case vm_none: std::cout<<"| null |";break;
         case vm_ret:  std::cout<<"| pc   | 0x"<<std::hex
                                <<val.ret()<<std::dec;break;
-        case vm_addr: std::cout<<"| addr | "<<std::hex
-                               <<(void*)val.addr()<<std::dec;break;
+        case vm_addr: std::cout<<"| addr | 0x"<<std::hex
+                               <<(uint64_t)val.addr()<<std::dec;break;
         case vm_cnt:  std::cout<<"| cnt  | "<<val.cnt();break;
         case vm_nil:  std::cout<<"| nil  |";break;
         case vm_num:  std::cout<<"| num  | "<<val.num();break;
-        case vm_str:  std::cout<<"| str  | <"<<std::hex<<p<<"> "
-                               <<rawstr(val.str(),16)<<std::dec;break;
-        case vm_func: std::cout<<"| func | <"<<std::hex<<p<<"> entry:0x"
-                               <<val.func().entry<<std::dec;break;
-        case vm_upval:std::cout<<"| upval| <"<<std::hex<<p<<std::dec<<"> ["
-                               <<val.upval().size<<" val]";break;
-        case vm_vec:  std::cout<<"| vec  | <"<<std::hex<<p<<std::dec<<"> ["
-                               <<val.vec().size()<<" val]";break;
-        case vm_hash: std::cout<<"| hash | <"<<std::hex<<p<<std::dec<<"> {"
-                               <<val.hash().size()<<" val}";break;
-        case vm_obj:  std::cout<<"| obj  | <"<<std::hex<<p<<"> obj:0x"
-                               <<(uint64_t)val.obj().ptr<<std::dec;break;
-        case vm_co:   std::cout<<"| co   | <"<<std::hex<<p<<std::dec
-                               <<"> coroutine";break;
-        default:      std::cout<<"| err  | <"<<std::hex<<p<<std::dec
-                               <<"> unknown object";break;
+        case vm_str:  std::cout<<"| str  | <0x"<<std::hex<<(uint64_t)p
+                               <<"> "<<rawstr(val.str(),16)<<std::dec;break;
+        case vm_func: std::cout<<"| func | <0x"<<std::hex<<(uint64_t)p
+                               <<"> entry:0x"<<val.func().entry
+                               <<std::dec;break;
+        case vm_upval:std::cout<<"| upval| <0x"<<std::hex<<(uint64_t)p
+                               <<std::dec<<"> ["<<val.upval().size
+                               <<" val]";break;
+        case vm_vec:  std::cout<<"| vec  | <0x"<<std::hex<<(uint64_t)p
+                               <<std::dec<<"> ["<<val.vec().size()
+                               <<" val]";break;
+        case vm_hash: std::cout<<"| hash | <0x"<<std::hex<<(uint64_t)p
+                               <<std::dec<<"> {"<<val.hash().size()
+                               <<" val}";break;
+        case vm_obj:  std::cout<<"| obj  | <0x"<<std::hex<<(uint64_t)p
+                               <<"> obj:0x"<<(uint64_t)val.obj().ptr
+                               <<std::dec;break;
+        case vm_co:   std::cout<<"| co   | <0x"<<std::hex<<(uint64_t)p
+                               <<std::dec<<"> coroutine";break;
+        default:      std::cout<<"| err  | <0x"<<std::hex<<(uint64_t)p
+                               <<std::dec<<"> unknown object";break;
     }
     std::cout<<"\n";
 }
@@ -247,11 +252,11 @@ void nasal_vm::register_info()
 {
     std::cout<<"registers("<<(gc.coroutine?"coroutine":"main")<<")\n"<<std::hex
              <<"  [ pc     ]    | pc   | 0x"<<pc<<"\n"
-             <<"  [ global ]    | addr | "<<stack<<"\n"
-             <<"  [ localr ]    | addr | "<<localr<<"\n"
-             <<"  [ memr   ]    | addr | "<<memr<<"\n"
-             <<"  [ canary ]    | addr | "<<canary<<"\n"
-             <<"  [ top    ]    | addr | "<<top<<"\n"
+             <<"  [ global ]    | addr | 0x"<<(uint64_t)stack<<"\n"
+             <<"  [ localr ]    | addr | 0x"<<(uint64_t)localr<<"\n"
+             <<"  [ memr   ]    | addr | 0x"<<(uint64_t)memr<<"\n"
+             <<"  [ canary ]    | addr | 0x"<<(uint64_t)canary<<"\n"
+             <<"  [ top    ]    | addr | 0x"<<(uint64_t)top<<"\n"
              <<std::dec;
     std::cout<<"  [ funcr  ]";valinfo(funcr);
     std::cout<<"  [ upvalr ]";valinfo(upvalr);