qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ruamoko] Correct obj_msg_sendv for __obj_forward

Browse source 
Until I implemented forwarding, I didn't know how obj_msg_sendv was
meant to be used, so no surprise I got the implementation wrong.
This commit is contained in:
Bill Currie 2020-03-10 02:56:37 +09:00
parent e9eab68366
commit 4b7d5447bb
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libs/ruamoko/rua_obj.c
View file

@ -1386,22 +1386,41 @@ static void
rua_obj_msg_sendv (progs_t *pr)
{
probj_t *probj = pr->pr_objective_resources;
pointer_t obj = P_POINTER (pr, 0);
pr_id_t *receiver = &P_STRUCT (pr, pr_id_t, 0);
pointer_t sel = P_POINTER (pr, 1);
pr_sel_t *op = &P_STRUCT (pr, pr_sel_t, 1);
pr_va_list_t *args = (pr_va_list_t *) &P_POINTER (pr, 2);
pr_type_t *params = G_GPOINTER (pr, args->list);
int count = args->count;
func_t imp = obj_msg_lookup (probj, receiver, op);
count = bound (0, count, 6);
if (count && pr_boundscheck->int_val)
__auto_type args = &P_PACKED (pr, pr_va_list_t, 2);
int count = args->count;
pr_type_t *params = G_GPOINTER (pr, args->list);
if (count < 2 || count > MAX_PARMS) {
PR_RunError (pr, "bad args count in obj_msg_sendv: %d", count);
}
if (pr_boundscheck->int_val) {
PR_BoundsCheckSize (pr, args->list, count * pr->pr_param_size);
if (!imp)
}
if (!imp) {
PR_RunError (pr, "%s does not respond to %s",
PR_GetString (pr, object_get_class_name (probj, receiver)),
PR_GetString (pr, probj->selector_names[op->sel_id]));
if (count)
memcpy (pr->pr_params[2], params, count * 4 * pr->pr_param_size);
}
pr->pr_argc = count;
// skip over the first two parameters because receiver and op will
// replace them
count -= 2;
params += 2 * pr->pr_param_size;
PR_RESET_PARAMS (pr);
P_POINTER (pr, 0) = obj;
P_POINTER (pr, 1) = sel;
if (count) {
memcpy (&P_INT (pr, 2), params,
count * sizeof (pr_type_t) * pr->pr_param_size);
}
PR_CallFunction (pr, imp);
}