svn commit: r565185 - /harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/util.h

[dl...@apache.org]

Author: dlydick
Date: Sun Aug 12 15:25:30 2007
New Revision: 565185

URL: http://svn.apache.org/viewvc?view=rev&rev=565185
Log:
Restructured argv utility message prototypes.

Overhauled manifest_xxx() prototypes for new code layout.

Overhauled tmparea_xxx() prototypes for heap mgmt support.

Modified:
    harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/util.h

Modified: harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/util.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/util.h?view=diff&rev=565185&r1=565184&r2=565185
==============================================================================
--- harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/util.h (original)
+++ harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/util.h Sun Aug 12 15:25:30 2007
@@ -9,7 +9,11 @@
  * Source files whose function prototypes are defined
  * herein include:
  *
- *     @link jvm/src/argv.c argv.c@endlink
+ *     @link jvm/src/jvmargv.c jvmargv.c@endlink
+ *
+ *     @link jvm/src/jarargv.c jarargv.c@endlink
+ *
+ *     @link jvm/src/argvutil.c argvutil.c@endlink
  *
  *     @link jvm/src/bytegames.c bytegames.c@endlink
  *
@@ -222,21 +226,40 @@
  */
 
 
-/* Prototypes for functions in 'argv.c' */
+/* Prototypes for functions in 'jarargv.c' */
+/* (Prototype for jarargv_init() is in 'jar.h') */
+
+extern rvoid jarargv_shutdown(rboolean *argv_init_flag);
+
+extern rvoid jarargv_helpmsg(rvoid);
+
+extern rvoid jarargv_showmsg(rvoid);
+
+
+/* Prototypes for functions in 'jvmargv.c' */
 
-extern rvoid argv_init(int argc, char **argv, char **envp);
+extern rvoid jvmargv_init(int        argc,
+                          char     **argv,
+                          char     **envp,
+                          rboolean  *argv_init_flag);
 
-extern rvoid argv_shutdown(rvoid);
+extern rvoid jvmargv_shutdown(rboolean *argv_init_flag);
 
-extern rvoid argv_versionmsg(rvoid);
+extern rvoid jvmargv_helpmsg(rvoid);
 
-extern rvoid argv_copyrightmsg(rvoid);
+extern rvoid jvmargv_showmsg(rvoid);
 
-extern rvoid argv_licensemsg(rvoid);
 
-extern rvoid argv_helpmsg(rvoid);
+/* Prototypes for functions in 'argvutil.c' */
+
+extern void argvutil_common_msghdr(void);
+
+extern void argvutil_common_msgs(void);
+
+extern void argvutil_jvm_showmsg(void);
+
+extern void argvutil_jar_showmsg(void);
 
-extern rvoid argv_showmsg(rvoid);
 
 
 /* Prototypes for small utility functions in 'jvmutil.c' */
@@ -246,6 +269,10 @@
 extern rvoid                jvmutil_set_dml(jvm_debug_level_enum level);
 extern jvm_debug_level_enum jvmutil_get_dml(rvoid);
 
+extern rvoid                jvmutil_versionmsg(rvoid);
+extern rvoid                jvmutil_copyrightmsg(rvoid);
+extern rvoid                jvmutil_licensemsg(rvoid);
+
 extern rvoid jvmutil_print_stack(jvm_thread_index  thridx,
                                  rchar            *pheader);
 extern rvoid jvmutil_print_stack_details(jvm_thread_index  thridx,
@@ -258,7 +285,8 @@
 
 /* Prototypes for functions in 'manifest.c' */
 
-extern rchar *manifest_get_main(rchar *mnfname);
+extern rchar *manifest_get_main_from_file(rchar *mnfname);
+extern rchar *manifest_get_main_from_bfr(rchar *mbfr, rint mbfrlen);
 
 
 /* Prototypes for functions in 'timeslice.c' */
@@ -271,9 +299,16 @@
 
 /* Prototypes for functions in 'tmparea.c' */
 
-extern rvoid tmparea_init(char **argv);
+extern rvoid tmparea_init(char     **argv,
+                          rvoid     *(* heap_get_data)(rint, rboolean),
+                          rvoid      (* heap_free_data)(rvoid *),
+                          rboolean  *tmparea_init_flag);
+
 extern const rchar *tmparea_get(rvoid);
-extern rvoid tmparea_shutdown(rvoid);
+
+extern rvoid tmparea_shutdown(rvoid   *(* heap_get_data)(rint,rboolean),
+                              rvoid    (* heap_free_data)(rvoid *),
+                             rboolean *tmparea_init_flag);
 
 #endif /* _util_h_defined_ */