Fix for hspcmp 64bit

Author: onitama

src/hsp3/hsp3struct.h

@@ -5,13 +5,23 @@
 #ifndef __hsp3struct_h
 #define __hsp3struct_h
 
+#include <cstdint>
 #include "hspvar_core.h"
 #include "hsp3debug.h"
 
-#ifdef _WIN64
+#if UINTPTR_MAX == 0xffffffffffffffffu
 #define PTR64BIT        //  ポインタは64bit
-#else
+#ifndef HSP64
+#warning HSP64 is not defined, but pointer is 64bit
+#endif
+#elif UINTPTR_MAX == 0xffffffff
 #define PTR32BIT        //  ポインタは32bit
+
+#ifdef HSP64
+#warning HSP64 is defined, but pointer is 32bit
+#endif
+#else
+#error Unknown pointer size
 #endif
 
 //		HSPが使用する実数型

src/hspcmp/codegen.cpp

@@ -1847,9 +1847,8 @@ int CToken::GetParameterResTypeCG( char *name )
 	return MPTYPE_NONE;
 }
 
-
-#define GET_FI_SIZE() ((int)(fi_buf->GetSize() / sizeof(STRUCTDAT)))
-#define GET_FI(n) (((STRUCTDAT *)fi_buf->GetBuffer()) + (n))
+#define GET_FI_SIZE() ((int)(fi_buf->GetSize() / sizeof(HED_STRUCTDAT)))
+#define GET_FI(n) (((HED_STRUCTDAT *)fi_buf->GetBuffer()) + (n))
 #define STRUCTDAT_INDEX_DUMMY ((short)0x8000)
 
 
@@ -1864,7 +1863,7 @@ void CToken::GenerateCodePP_deffunc0( int is_command )
 	int prep;
 	char funcname[1024];
 	STRUCTPRM *prm;
-	STRUCTDAT *st;
+	HED_STRUCTDAT *st;
 
 	prep = 0;
 	GetTokenCG( GETTOKEN_DEFAULT );
@@ -1927,7 +1926,7 @@ void CToken::GenerateCodePP_deffunc0( int is_command )
 				regflag = 0;
 			}
 			if ( t == MPTYPE_TMODULEVAR ) {
-				st = (STRUCTDAT *)fi_buf->GetBuffer();
+				st = (HED_STRUCTDAT *)fi_buf->GetBuffer();
 				if ( st[ subid ].otindex != 0 ) throw CGERROR_PP_MODTERM_USED;
 				st[ subid ].otindex = GET_FI_SIZE();
 				regflag = 0;
@@ -1961,7 +1960,7 @@ void CToken::GenerateCodePP_deffunc0( int is_command )
 	ot = PutOT( GetCS() );
 	if ( index == -1 ) {
 		index = GET_FI_SIZE();
-		fi_buf->PreparePtr( sizeof(STRUCTDAT) );
+		fi_buf->PreparePtr( sizeof(HED_STRUCTDAT) );
 		if ( regflag ) {
 			lb->Regist( funcname, TYPE_MODCMD, index, cg_orgfilefull, cg_orgline);
 		}
@@ -2563,10 +2562,10 @@ void CToken::PutCSSymbol( int label_id, int exflag )
 		int id = *(int *)lb->GetData2(label_id);
 		tmp_lb->AddReference( id );
 
-		STRUCTDAT st = { STRUCTDAT_INDEX_DUMMY };
+		HED_STRUCTDAT st = { STRUCTDAT_INDEX_DUMMY };
 		st.otindex = label_id;
 		value = GET_FI_SIZE();
-		fi_buf->PutData( &st, sizeof(STRUCTDAT) );
+		fi_buf->PutData( &st, sizeof(HED_STRUCTDAT) );
 		lb->SetOpt( label_id, value );
 	}
 	if ( exflag & EXFLG_1 && type != TYPE_VAR && type != TYPE_STRUCT ) {
@@ -2835,10 +2834,10 @@ char *CToken::GetDS( int ptr )
 int CToken::PutLIB( int flag, char *name )
 {
 	int a,i = -1,p;
-	LIBDAT lib;
-	LIBDAT *l;
-	p = li_buf->GetSize() / sizeof(LIBDAT);
-	l = (LIBDAT *)li_buf->GetBuffer();
+	HED_LIBDAT lib;
+	HED_LIBDAT *l;
+	p = li_buf->GetSize() / sizeof(HED_LIBDAT);
+	l = (HED_LIBDAT *)li_buf->GetBuffer();
 
 	if ( flag == LIBDAT_FLAG_DLL ) {
 		if ( *name != 0 ) {
@@ -2863,7 +2862,11 @@ int CToken::PutLIB( int flag, char *name )
 
 	lib.flag = flag;
 	lib.nameidx = i;
+#ifdef PTR64BIT
+	lib.p_hlib = 0;
+#else
 	lib.hlib = NULL;
+#endif
 	lib.clsid = -1;
 	li_buf->PutData( &lib, sizeof(LIBDAT) );
 	//Mesf( "LIB#%d:%s",flag,name );
@@ -2930,7 +2933,9 @@ int CToken::PutStructParam( short mptype, int extype )
 	case MPTYPE_PTR_EXINFO:
 	case MPTYPE_PTR_DPMINFO:
 	case MPTYPE_NULLPTR:
-		size = sizeof(char *);
+		// XXX 32bit版換算でax出力する
+		//size = sizeof(char *);
+		size = 4;
 		break;
 	case MPTYPE_SINGLEVAR:
 	case MPTYPE_ARRAYVAR:
@@ -2980,7 +2985,7 @@ int CToken::PutStructEnd( int i, char *name, int libindex, int otindex, int func
 {
 	//		STRUCTDATを登録する(モジュール用)
 	//
-	STRUCTDAT st;
+	HED_STRUCTDAT st;
 	st.index = libindex;
 	st.nameidx = PutDSBuf( name );
 	st.subid = i;
@@ -3003,7 +3008,7 @@ int CToken::PutStructEnd( int i, char *name, int libindex, int otindex, int func
 int CToken::PutStructEnd( char *name, int libindex, int otindex, int funcflag )
 {
 	int i = GET_FI_SIZE();
-	fi_buf->PreparePtr( sizeof(STRUCTDAT) );
+	fi_buf->PreparePtr( sizeof(HED_STRUCTDAT) );
 	return PutStructEnd( i, name, libindex, otindex, funcflag );
 }
 
@@ -3012,7 +3017,7 @@ int CToken::PutStructEndDll( char *name, int libindex, int subid, int otindex )
 	//		STRUCTDATを登録する(DLL用)
 	//
 	int i;
-	STRUCTDAT st;
+	HED_STRUCTDAT st;
 	i = GET_FI_SIZE();
 	st.index = libindex;
 	if ( name[0] == '*' ) {
@@ -3023,10 +3028,11 @@ int CToken::PutStructEndDll( char *name, int libindex, int subid, int otindex )
 	st.subid = subid;
 	st.prmindex = cg_stptr;
 	st.prmmax = cg_stnum;
-	st.proc = NULL;
+	//st.proc = NULL;
+	st.funcflag = 0;
 	st.size = cg_stsize;
 	st.otindex = otindex;
-	fi_buf->PutData( &st, sizeof(STRUCTDAT) );
+	fi_buf->PutData( &st, sizeof(HED_STRUCTDAT) );
 	//Mesf( "#%d : %s(LIB%d) prm%d size%d ot%d", i, name, libindex, cg_stnum, cg_stsize, otindex );
 	return i;
 }
@@ -3039,7 +3045,7 @@ void CToken::PutHPI( short flag, short option, char *libname, char *funcname )
 	hpi.option = option;
 	hpi.libname = PutDSBuf( libname );
 	hpi.funcname = PutDSBuf( funcname );
-#ifndef HSP64
+#ifndef PTR64BIT
 	hpi.libptr = NULL;
 #else
 	hpi.p_libptr = 0;
@@ -3299,7 +3305,7 @@ int CToken::GenerateCode( CMemBuf *srcbuf, char *oname, int mode )
 		} else {
 			int n_mod, n_hpi;
 			n_hpi = hpi_buf->GetSize() / sizeof(HPIDAT);
-			n_mod = fi_buf->GetSize() / sizeof(STRUCTDAT);
+			n_mod = fi_buf->GetSize() / sizeof(HED_STRUCTDAT);
 			Mesf( "#Code size (%d) String data size (%d) param size (%d)",cs_size,ds_size,mi_buf->GetSize() );
 			Mesf( "#Vars (%d) Labels (%d) Modules (%d) Libs (%d) Plugins (%d)",cg_valcnt,ot_size>>2,n_mod,li_size,n_hpi );
 			if (sz_exopt) {