Merged with tip.

[cacao.git] / src / vm / jit / argument.h

diff --git a/src/vm/jit/argument.h b/src/vm/jit/argument.h
index 5dd355a40d90d6f2b3aacd706486be041597c896..fe6ef25fa50a18035ea916ddd325665e5daff7da 100644 (file)
--- a/src/vm/jit/argument.h
+++ b/src/vm/jit/argument.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/argument.h - argument passing from and to JIT methods
 
-   Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -32,6 +30,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "vm/global.h"
 
 
@@ -39,12 +41,24 @@
 
 imm_union argument_jitarray_load(methoddesc *md, int32_t index,
                                                                 uint64_t *arg_regs, uint64_t *stack);
-
-void argument_jitarray_store(methoddesc *md, int32_t index,
-                                                        uint64_t *arg_regs, uint64_t *stack,
-                                                        imm_union param);
+void      argument_jitarray_store(methoddesc *md, int32_t index,
+                                                                 uint64_t *arg_regs, uint64_t *stack,
+                                                                 imm_union param);
 
 imm_union argument_jitreturn_load(methoddesc *md, uint64_t *return_regs);
+void      argument_jitreturn_store(methoddesc *md, uint64_t *return_regs,
+                                                                  imm_union ret);
+
+uint64_t *argument_vmarray_from_valist(methodinfo *m, java_handle_t *o,
+                                                                          va_list ap);
+uint64_t *argument_vmarray_from_jvalue(methodinfo *m, java_handle_t *o,
+                                                                          const jvalue *args);
+uint64_t *argument_vmarray_from_objectarray(methodinfo *m, java_handle_t *o,
+                                                                                       java_handle_objectarray_t *params);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _VM_JIT_ARGUMENT_H */