mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
94ff26b96b
* libguile/_scm.h (SCM_OBJCODE_MINOR_VERSION): Bump.
* libguile/vm-engine.c (vm_error_bad_wide_string_length): New error
case.
* libguile/vm-i-loader.c (load-unsigned-integer, load-integer)
(load-keyword): Remove these instructions. The former two are
obsoleted by make-int64/make-uint64, the latter via make-keyword.
(load-string): Only handle narrow strings.
(load-symbol): Only handle narrow symbols. The wide case is handled
via make-symbol.
(load-wide-string): New instruction, for wide strings.
* libguile/vm-i-system.c (define): Move here from loaders.c, as now it
just takes a sym on the stack.
(make-keyword, make-symbol): New instructions.
* module/language/assembly.scm: Remove removed instructions. No more
width byte in load-string etc.
* module/language/assembly/compile-bytecode.scm (write-bytecode): Adapt
to change in instruction set.
* module/language/glil/compile-assembly.scm (glil->assembly): Compile
define by pushing the sym then emitting (define).
(dump-object): Dump narrow and wide strings differently. Use
make-keyword and make-symbol as appropriate.
* module/language/tree-il/compile-glil.scm (flatten): When compiling a
ref to a primitive (not a call), first see if the primitive is
actually bound in the root module. (That's not the case with e.g.
bytevector-u8-ref).
* module/system/xref.scm (program-callee-rev-vars): Don't parse out
"nexts".
* test-suite/tests/asm-to-bytecode.test ("compiler"): Adapt to bytecode
format change.
137 lines
3.3 KiB
C
137 lines
3.3 KiB
C
/* Copyright (C) 2001,2008,2009 Free Software Foundation, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
* as published by the Free Software Foundation; either version 3 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*/
|
|
|
|
/* FIXME! Need to check that the fetch is within the current program */
|
|
|
|
/* This file is included in vm_engine.c */
|
|
|
|
VM_DEFINE_LOADER (82, load_number, "load-number")
|
|
{
|
|
size_t len;
|
|
|
|
FETCH_LENGTH (len);
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_string_to_number (scm_from_locale_stringn ((char *)ip, len),
|
|
SCM_UNDEFINED /* radix = 10 */));
|
|
/* Was: scm_istring2number (ip, len, 10)); */
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (83, load_string, "load-string")
|
|
{
|
|
size_t len;
|
|
char *buf;
|
|
|
|
FETCH_LENGTH (len);
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_i_make_string (len, &buf));
|
|
memcpy (buf, (char *) ip, len);
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (84, load_symbol, "load-symbol")
|
|
{
|
|
size_t len;
|
|
FETCH_LENGTH (len);
|
|
SYNC_REGISTER ();
|
|
/* FIXME: should be scm_from_latin1_symboln */
|
|
PUSH (scm_from_locale_symboln ((const char*)ip, len));
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (86, load_program, "load-program")
|
|
{
|
|
scm_t_uint32 len;
|
|
SCM objs, objcode;
|
|
|
|
POP (objs);
|
|
SYNC_REGISTER ();
|
|
|
|
if (scm_is_vector (objs) && scm_is_false (scm_c_vector_ref (objs, 0)))
|
|
scm_c_vector_set_x (objs, 0, scm_current_module ());
|
|
|
|
objcode = scm_c_make_objcode_slice (SCM_PROGRAM_OBJCODE (fp[-1]), ip);
|
|
len = sizeof (struct scm_objcode) + SCM_OBJCODE_TOTAL_LEN (objcode);
|
|
|
|
PUSH (scm_make_program (objcode, objs, SCM_BOOL_F));
|
|
|
|
ip += len;
|
|
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_INSTRUCTION (87, link_now, "link-now", 0, 1, 1)
|
|
{
|
|
SCM what;
|
|
POP (what);
|
|
SYNC_REGISTER ();
|
|
PUSH (resolve_variable (what, scm_current_module ()));
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (89, load_array, "load-array")
|
|
{
|
|
SCM type, shape;
|
|
size_t len;
|
|
FETCH_LENGTH (len);
|
|
POP (shape);
|
|
POP (type);
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_from_contiguous_typed_array (type, shape, ip, len));
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (90, load_wide_string, "load-wide-string")
|
|
{
|
|
size_t len;
|
|
scm_t_wchar *wbuf;
|
|
|
|
FETCH_LENGTH (len);
|
|
if (SCM_UNLIKELY (len % 4))
|
|
{ finish_args = scm_list_1 (scm_from_size_t (len));
|
|
goto vm_error_bad_wide_string_length;
|
|
}
|
|
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_i_make_wide_string (len / 4, &wbuf));
|
|
memcpy ((char *) wbuf, (char *) ip, len);
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
/*
|
|
(defun renumber-ops ()
|
|
"start from top of buffer and renumber 'VM_DEFINE_FOO (\n' sequences"
|
|
(interactive "")
|
|
(save-excursion
|
|
(let ((counter 79)) (goto-char (point-min))
|
|
(while (re-search-forward "^VM_DEFINE_[^ ]+ (\\([^,]+\\)," (point-max) t)
|
|
(replace-match
|
|
(number-to-string (setq counter (1+ counter)))
|
|
t t nil 1)))))
|
|
*/
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|