diff --git a/nasal.h b/nasal.h index 5af0918..a564e5f 100644 --- a/nasal.h +++ b/nasal.h @@ -3,10 +3,12 @@ #define __nasver "9.0" -#include + #include -#include -#include + +#include +#include +#include #include #include #include diff --git a/nasal_builtin.h b/nasal_builtin.h index d10dbba..7b9f3da 100644 --- a/nasal_builtin.h +++ b/nasal_builtin.h @@ -1249,7 +1249,7 @@ std::string md5(std::string& source) uint32_t buffsize=num<<4; buff.resize(buffsize,0); for(uint32_t i=0;i>2]|=(source[i])<<((i&0x3)<<3); + buff[i>>2]|=((unsigned char)source[i])<<((i&0x3)<<3); buff[source.length()>>2]|=0x80<<(((source.length()%4))<<3); buff[buffsize-2]=(source.length()<<3)&0xffffffff; buff[buffsize-1]=((source.length()<<3)>>32)&0xffffffff; diff --git a/nasal_vm.h b/nasal_vm.h index 9d9fd8d..d5cd0d1 100644 --- a/nasal_vm.h +++ b/nasal_vm.h @@ -257,10 +257,10 @@ void nasal_vm::stackinfo(const uint32_t limit=10) printf("0)\n"); return; } - printf("" PRTINT64 "):\n",top-bottom+1); + printf("" PRTINT64 "):\n",(int64_t)(top-bottom+1)); for(uint32_t i=0;i=bottom;++i,--top) { - printf(" 0x" PRTHEX64_8 "",top-gc.stack); + printf(" 0x" PRTHEX64_8 "",(uint64_t)(top-gc.stack)); valinfo(top[0]); } } @@ -280,7 +280,7 @@ void nasal_vm::local_state() if(!localr || !gc.funcr.func().lsize) return; uint32_t lsize=gc.funcr.func().lsize; - printf("local(0x" PRTHEX64 "):\n",(uint64_t)localr,localr-gc.stack); + printf("local(0x" PRTHEX64 "):\n",(uint64_t)localr,(int64_t)(localr-gc.stack)); for(uint32_t i=0;i=2){ - prt~="#"; + prt_cnt+=1; lastpercent=percent; } - var tmp=prt; - for(var spc=size(prt);spc<50;spc+=1) - tmp~=" "; - print(" |",tmp,"| ",percent,"% (",i-begin+1,"/",total,")\t",res," max byte: ",end-1," \r"); + print(progress_bar[prt_cnt],percent,"% (",i-begin+1,"/",total,")\t",res," max byte: ",end-1," \r"); } print('\n'); }; @@ -39,7 +48,7 @@ var filechecksum=func(){ for(var i=0;i