X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fnumber.c;h=5e62c62535e8297baaf33c9e2df3e76a2aa658fd;hp=b45e00ea2fe4126890ba97ac89b07823d4c2f26f;hb=ef40ce43c98a00823e06c14f5cf7a8241f637ab1;hpb=35ae2559447092572209f8b237460ceb551293ff

diff --git a/src/types/number.c b/src/types/number.c
index b45e00e..5e62c62 100644
--- a/src/types/number.c
+++ b/src/types/number.c
@@ -74,6 +74,8 @@ struct psi_number *psi_number_init(token_t t, void *num, unsigned flags)
 		exp->data.ival.ldval = *(long double *) num;
 		break;
 #endif
+	case PSI_T_NULL:
+		break;
 	case PSI_T_QUOTED_CHAR:
 	case PSI_T_NUMBER:
 	case PSI_T_NSNAME:
@@ -120,6 +122,7 @@ struct psi_number *psi_number_copy(struct psi_number *exp)
 #endif
 	case PSI_T_ENUM:
 	case PSI_T_CONST:
+	case PSI_T_NULL:
 		break;
 	case PSI_T_NUMBER:
 	case PSI_T_NSNAME:
@@ -166,6 +169,7 @@ void psi_number_free(struct psi_number **exp_ptr)
 #endif
 		case PSI_T_ENUM:
 		case PSI_T_CONST:
+		case PSI_T_NULL:
 			break;
 		case PSI_T_FUNCTION:
 			psi_cpp_macro_call_free(&exp->data.call);
@@ -227,6 +231,9 @@ void psi_number_dump(int fd, struct psi_number *exp)
 		dprintf(fd, "%" PRIldval, exp->data.ival.ldval);
 		break;
 #endif
+	case PSI_T_NULL:
+		dprintf(fd, "NULL");
+		break;
 	case PSI_T_NUMBER:
 	case PSI_T_NSNAME:
 	case PSI_T_DEFINE:
@@ -451,6 +458,9 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
 	struct psi_decl_enum *enm;
 
 	switch (exp->type) {
+	case PSI_T_NULL:
+		exp->type = PSI_T_UINT8;
+		/* no break */
 	case PSI_T_CONST:
 	case PSI_T_INT8:
 	case PSI_T_UINT8:
@@ -481,11 +491,12 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
 		if (exp->data.dvar->arg) {
 			return true;
 		}
-		if (psi_decl_var_validate(data, exp->data.dvar, impl ? impl->decl : NULL,
-				current_let, current_set)) {
+		if (psi_decl_var_validate(data, exp->data.dvar, impl,
+				impl ? impl->decl : NULL, current_let, current_set)) {
 			return true;
 		}
-		if (cb_decl && psi_decl_var_validate(data, exp->data.dvar, cb_decl, NULL, NULL)) {
+		if (cb_decl && psi_decl_var_validate(data, exp->data.dvar,
+				NULL, cb_decl, NULL, NULL)) {
 			return true;
 		}
 		data->error(data, exp->token, PSI_WARNING,
@@ -499,7 +510,12 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
 
 			exp->type = PSI_T_UINT64;
 			exp->data.ival.u64 = psi_decl_type_get_size(dtyp, NULL);
+			psi_decl_type_free(&dtyp);
 			return true;
+		} else {
+			data->error(data, exp->token, PSI_WARNING,
+					"Cannot compute sizeof(%s) (%u)",
+					exp->data.dtyp->name, exp->data.dtyp->type);
 		}
 		break;
 
@@ -547,7 +563,7 @@ static inline token_t psi_number_eval_constant(struct psi_number *exp,
 		if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIdval, res->dval);
 		return PSI_T_DOUBLE;
 	default:
-		if (frame) PSI_DEBUG_PRINT(frame->context, " ?(t=%d)", exp->data.cnst->type->type);
+		if (frame) PSI_DEBUG_PRINT(frame->context, " ?(t=%u)", exp->data.cnst->type->type);
 		return 0;
 	}
 }
@@ -559,15 +575,27 @@ static inline token_t psi_number_eval_decl_var(struct psi_number *exp,
 	impl_val *ref;
 	struct psi_call_frame_symbol *sym;
 	struct psi_decl_type *real;
+	struct psi_decl_var *var;
 	size_t size;
 
-	real = psi_decl_type_get_real(exp->data.dvar->arg->type);
-	size = psi_decl_arg_get_size(exp->data.dvar->arg);
-	sym = psi_call_frame_fetch_symbol(frame, exp->data.dvar);
-	ref = deref_impl_val(sym->ptr, exp->data.dvar);
+	var = exp->data.dvar;
+	real = psi_decl_type_get_real(var->arg->type);
+	size = psi_decl_arg_get_size(var->arg);
+	sym = psi_call_frame_fetch_symbol(frame, var);
+	ref = deref_impl_val(sym->ptr, var);
 
 	memcpy(res, ref, size);
 
+	if (var->arg->var->pointer_level > var->pointer_level) {
+		switch (SIZEOF_VOID_P) {
+		case 4:
+			return PSI_T_INT32;
+		case 8:
+			return PSI_T_INT64;
+		default:
+			assert(0);
+		}
+	}
 	return real->type;
 }