Better identify functions that misuse COBJ-s and hashes.

In this patch, the cobj_handle, cobj_ops and variants of
gethash get an additional argument to identify the caller.
Many functions are updated to pass this down.

* buf.c (buf_strm): Pass self name to cobj_handle.

* eval.c (env_fbind, env_vbind, rt_defvarl, me_case): Pass
self name to gethash_c or gethash_e.
(load): Pass self name to read_eval_stream and
read_compiled_file.
(reg_symacro): Pass situation-identifying string to gethash_c.

* ffi.c (ffi_type_struct_checked, ffi_closure_struct_checked,
ffi_call_desc_checked, uni_struct_checked):
Take self name parameter, and pass down to cobj_handle.
(ffi_get_type, ffi_get_lisp_type): Take self name and pass
down to ffi_type_struct_checked.
(union_get_ptr): Take self name and pass to
uni_struct_checked.
(ffi_union_in, ffi_union_put): Pass self name to union_get_ptr.
(ffi_type_compile): Pass self name to ffi_get_lisp_type.
(ffi_make_call_desc): Pass self name to
ffi_type_struct_checked, ffi_get_type and
ffi_call_desc_checked.
(ffi_make_closure): Pass self name to ffi_call_desc_checked.
(ffi_closure_get_fptr): Take self name, pass to
ffi_closure_struct_checked.
(ffi_typedef, ffi_size, ffi_alignof, ffi_offsetof,
ffi_arraysize, ffi_elemsize, ffi_elemtype, ffi_put_into,
ffi_put, ffi_in, ffi_get, ffi_out, make_carray): Pass self
name to ffi_closure_struct_checked.
(carray_struct_checked): Take self name, pass to cobj_handle.
(carray_set_length, carray_dup, carray_own, carray_free,
carray_type, length_carray, copy_carray, carray_ptr,
buf_carray, vec_carray, list_carray, carray_ref,
carray_refset, carray_sub, carray_replace, carray_get_common,
carray_put_common, unum_carray, num_carray, put_carray,
fill_carray): Pass self name to carray_struct_checked.
(carray_blank, carray_buf, carray_cptr): Pass self name
ffi_type_struct_checked.
(carray_pun): Pass self name to carray_struct_checked and
ffi_type_struct_checked.
(make_union): Pass self name to ffi_type_struct_checked.
(union_members, union_get, union_put, union_in, union_out):
Pass self name to uni_struct_checked.
(make_zstruct, zero_fill, put_obj, get_obj, fill_obj): Pass
self-name to ffi_type_struct_checked.

* ffi.h (ffi_closure_get_fptr, union_get_ptr): Declarations
updated.

* filter.c (trie_add): Pass self-name to gethash_l.

* hash.c (make_similar_hash, copy_hash, hash_count,
get_hash_userdata, set_hash_userdata, hash_begin, hash_next,
hash_uni, hash_diff, hash_isec): Pass self name
to cobj_handle.
(gethash_c, gethash_e): Take self name parameter and pass down
to cobj_handle.
(gethash_f): Take self parameter and pass down to gethash_e.
(gethash, inhash, gethash_n, sethash, pushhash, remhash,
clearhash, hash_update_1): Pass self name to gethash_e or gethash_c.

* hash.h (gethash_c, gethash_e, gethash_f): Declarations
updated.
(gethash_l): Take self name, and pass down to gethash_c.

* lib.c (class_check): Take self name parameter and use in
type mismatch diagnostic.
(use_sym, unuse_sym, symbol_needs_prefix, find_symbol,
intern, unintern, intern_fallback, unique, in, sel,
obj_print_impl, populate_obj_hash, obj_hash_merge): Pass self
name to gethash_f or gethash_l.
(symbol_visible, obj_init): Pass situation-identifying string
to gethash_e.
(cobj_handle, cobj_ops): Take self name parameter and pass
down to class_check.

* lib.h (class_check, cobj_handle, cobj_ops): Declarations
updated.

* match.c (v_load): Pass self name to read_compiled_file and
read_eval_stream.

* parser.c (get_parser_impl): Take self name and pass to
cobj_handle.
(ensure_parser): Pass situation-identifying string to
gethash_c.
(parser_circ_def): Pass self-name to gethash_c.
(lisp_parser_impl): Pass self name to get_parser_impl and
class_check.
(lisp_parse, nread, iread): Pass self-name to lisp_parser_impl.
(read_file_common): Take self name parameter and pass down to
get_parser_impl.
(read_eval_stream, read_compiled_file): Take self name and
pass down to read_file_common.
(load_rcfile): Pass situation-identifying string to
read_eval_streem.
(get_visible_syms): Pass situation-identifying string to
gethash_c.
(parser_errors, parser_eof): Pass self name to cobj_handle.

* parser.h (read_eval_stream, read_compiled_file):
Declarations updated.

* parser.y (rlset): Pass self name to gethash_c.

* rand.c (make_random_state, random_state_get_vec,l
random_fixnum, random_float): Pass self name to cobj_handle.

* regex.c (regex_source, regex_print, regex_run): Pass
self-name to cobj_handle.
(regex_machine_init): Take self name param and pass to
cobj_handle.
(search_regex, match_regex, match_regex_right,
regex_prefix_match, read_until_match): Pass self-name to
regex_machine_init.

* stream.c (stdio_get_fd): Pass self name to cobj_handle.
(generic_get_line): Get COBJ operations via unsafe, diret
object access rather than cobj_ops.
(set_mode_props): Get object handle via unsafe, direct object
access.
(stream_fd, sock_family, sock_type, sock_peer, set_sock_peer,
get_string_from_stream, get_list_from_stream, stream_set_prop,
stream_get_prop, close_stream, get_error, get_error_str,
clear_error, get_line, get_char, get_byte, unget_char,
unget_byte, put_buf, fill_buf, put_string, put_char, put_byte,
flush_stream, seek_stream, truncate_stream, get_indent_mode,
test_set_indent_mode, set_indent_mode, get_indent, set_indent,
inc_indent, width_check, force_break, get_set_ctx, get_ctx):
Pass self name to cobj_ops.
(make_delegate_stream): Take self name parameter, pass down to
cobj_ops.
(record_adapter): Pass self name down to make_delegate_stream.
(format): Pass self name to class_check.

* struct.c (stype_handle): Pass self name to cobj_handle.
(make_struct_type): Pass self name to class_check.

* txr.c (read_eval_stream_noerr): Take self name parameter,
pass to read_eval_stream.
(txr_main): Pass istuation-identifying string to
read_compiled_file and read_eval_stream_noerr.

* unwind.c (revive_cont): Pass self-name to cobj_handle.

* vm.c (vm_desc_struct): Take self name parameter, pass to
cobj_handle.
(vm_desc_nlevels, vm_desc_nregs, vm_desc_bytecode,
vm_desc_datavec, vm_desc_symvec, vm_execute_toplevel,
vm_execute_closure, vm_closure_entry): Pass self name to
vm_desc_struct.
(vm_closure_struct): Take self name parameter, pass to
cobj_handle.

1 files changed, 22 insertions, 13 deletions

diff --git a/vm.c b/vm.c
index 774124a4..c5a0ed17 100644
--- a/vm.c
+++ b/vm.c
@@ -111,9 +111,9 @@ static struct vm_desc_links vmd_list = {
   coerce(struct vm_desc *, &vmd_list), coerce(struct vm_desc *, &vmd_list)
 };
 
-static struct vm_desc *vm_desc_struct(val obj)
+static struct vm_desc *vm_desc_struct(val self, val obj)
 {
-  return coerce(struct vm_desc *, cobj_handle(obj, vm_desc_s));
+  return coerce(struct vm_desc *, cobj_handle(self, obj, vm_desc_s));
 }
 
 val vm_make_desc(val nlevels, val nregs, val bytecode,
@@ -175,31 +175,36 @@ val vm_make_desc(val nlevels, val nregs, val bytecode,
 
 static val vm_desc_nlevels(val desc)
 {
-  struct vm_desc *vd = vm_desc_struct(desc);
+  val self = lit("vm_desc_nlevels");
+  struct vm_desc *vd = vm_desc_struct(self, desc);
   return num(vd->nlvl);
 }
 
 static val vm_desc_nregs(val desc)
 {
-  struct vm_desc *vd = vm_desc_struct(desc);
+  val self = lit("vm-desc-nregs");
+  struct vm_desc *vd = vm_desc_struct(self, desc);
   return num(vd->nreg);
 }
 
 static val vm_desc_bytecode(val desc)
 {
-  struct vm_desc *vd = vm_desc_struct(desc);
+  val self = lit("vm-desc-bytecode");
+  struct vm_desc *vd = vm_desc_struct(self, desc);
   return vd->bytecode;
 }
 
 static val vm_desc_datavec(val desc)
 {
-  struct vm_desc *vd = vm_desc_struct(desc);
+  val self = lit("vm-desc-datavec");
+  struct vm_desc *vd = vm_desc_struct(self, desc);
   return vd->datavec;
 }
 
 static val vm_desc_symvec(val desc)
 {
-  struct vm_desc *vd = vm_desc_struct(desc);
+  val self = lit("vm-desc-symvec");
+  struct vm_desc *vd = vm_desc_struct(self, desc);
   return vd->symvec;
 }
 
@@ -227,9 +232,9 @@ static void vm_desc_mark(val obj)
     gc_mark(vd->stab[i].bind);
 }
 
-static struct vm_closure *vm_closure_struct(val obj)
+static struct vm_closure *vm_closure_struct(val self, val obj)
 {
-  return coerce(struct vm_closure *, cobj_handle(obj, vm_closure_s));
+  return coerce(struct vm_closure *, cobj_handle(self, obj, vm_closure_s));
 }
 
 static val vm_make_closure(struct vm *vm, int frsz)
@@ -1035,7 +1040,8 @@ NOINLINE static val vm_execute(struct vm *vm)
 
 val vm_execute_toplevel(val desc)
 {
-  struct vm_desc *vd = vm_desc_struct(desc);
+  val self = lit("vm-execute-toplevel");
+  struct vm_desc *vd = vm_desc_struct(self, desc);
   struct vm vm;
   val *frame = coerce(val *, alloca(sizeof *frame * vd->frsz));
   struct vm_env *dspl = coerce(struct vm_env *, frame + vd->nreg);
@@ -1057,11 +1063,12 @@ val vm_execute_toplevel(val desc)
 
 val vm_execute_closure(val fun, struct args *args)
 {
+  val self = lit("vm-execute-closure");
   val closure = fun->f.env;
   val desc = fun->f.f.vm_desc;
   int fixparam = fun->f.fixparam;
   int variadic = fun->f.variadic;
-  struct vm_desc *vd = vm_desc_struct(desc);
+  struct vm_desc *vd = vm_desc_struct(self, desc);
   struct vm_closure *vc = coerce(struct vm_closure *, closure->co.handle);
   struct vm vm;
   val *frame = coerce(val *, alloca(sizeof *frame * vd->frsz));
@@ -1122,13 +1129,15 @@ val vm_execute_closure(val fun, struct args *args)
 
 static val vm_closure_desc(val closure)
 {
-  struct vm_closure *vc = vm_closure_struct(closure);
+  val self = lit("vm-closure-desc");
+  struct vm_closure *vc = vm_closure_struct(self, closure);
   return vc->vd->self;
 }
 
 static val vm_closure_entry(val closure)
 {
-  struct vm_closure *vc = vm_closure_struct(closure);
+  val self = lit("vm-closure-entry");
+  struct vm_closure *vc = vm_closure_struct(self, closure);
   return unum(vc->ip);
 }