building cacao as an additional VM

[Andrew John Hughes]

2009/3/3 Matthias Klose <doko at ubuntu.com>:
> Triggered by archive administrators and security people who don't want to care
> about two copies of the OpenJDK code in a distribution, I tried to build cacao
> as additional VM in the same source package and avoiding separate builds. You
> can now call:
>
>  $ java -version
>  java version "1.6.0_0"
>  OpenJDK Runtime Environment (IcedTea6 1.4) (6b14-0ubuntu18)
>  OpenJDK Server VM (build 14.0-b08, mixed mode)
>
>  $ java -cacao -version
>  java version "1.6.0_0"
>  OpenJDK Runtime Environment (IcedTea6 1.4) (6b14-0ubuntu18)
>  CACAO (build 0.99.3+hg, compiled mode)
>
> The cacao bits are installed in <top>/jre/lib/<arch>/cacao, cacao is configured
> like for the cacao build in IcedTea, the cacao-alternate-vm patch replaces the
> icedtea-cacao patch, cacao-jni-version needs applied to the cacao sources.
> The file jvm.cfg.in needs an additional line '-cacao KNOWN'.
>
> There is no configure/make stuff for IcedTea yet; I'm currently assembling this
> directly in the packaging.
>
> Doing the same with Zero and with Shark? Didn't check yet, but maybe this would
> need a copy of openjdk/hotspot to openjdk/zero, so that patches are applied for
> the latter only.
>
> Ok to checkin these patches (without applying them)?
>
>  Matthias
>
> --- openjdk/jdk/src/solaris/bin/i586/jvm.cfg.orig       2009-03-02 23:21:31.000000000 +0000
> +++ openjdk/jdk/src/solaris/bin/i586/jvm.cfg    2009-03-02 23:21:48.000000000 +0000
> @@ -36,3 +36,4 @@
>  -classic WARN
>  -native ERROR
>  -green ERROR
> +-cacao KNOWN
> --- openjdk/jdk/src/solaris/bin/ia64/jvm.cfg.orig       2009-03-02 23:21:31.000000000 +0000
> +++ openjdk/jdk/src/solaris/bin/ia64/jvm.cfg    2009-03-02 23:21:48.000000000 +0000
> @@ -41,3 +41,4 @@
>  -client IGNORE
>  -native ERROR
>  -green ERROR
> +-cacao KNOWN
> --- openjdk/jdk/src/solaris/bin/amd64/jvm.cfg.orig      2009-03-02 23:21:31.000000000 +0000
> +++ openjdk/jdk/src/solaris/bin/amd64/jvm.cfg   2009-03-02 23:21:48.000000000 +0000
> @@ -37,3 +37,4 @@
>  -classic WARN
>  -native ERROR
>  -green ERROR
> +-cacao KNOWN
> --- openjdk/jdk/src/share/bin/java.c.orig       2009-03-02 23:21:31.000000000 +0000
> +++ openjdk/jdk/src/share/bin/java.c    2009-03-02 23:23:53.000000000 +0000
> @@ -199,6 +199,8 @@
>   InvocationFunctions ifn;
>  };
>
> +#define JNI_VERSION_CACAO 0xCACA0000
> +
>  /*
>  * Entry point.
>  */
> @@ -360,6 +389,8 @@
>
>     { /* Create a new thread to create JVM and invoke main method */
>       struct JavaMainArgs args;
> +      struct JDK1_1InitArgs cacao_args;
> +      int jvm_init_rv;
>
>       args.argc = argc;
>       args.argv = argv;
> @@ -367,7 +398,17 @@
>       args.classname = classname;
>       args.ifn = ifn;
>
> -      return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
> +      memset((void*)&cacao_args, 0, sizeof(cacao_args));
> +      cacao_args.version = JNI_VERSION_CACAO;
> +
> +      jvm_init_rv = ifn.GetDefaultJavaVMInitArgs(&cacao_args);
> +      if (_launcher_debug)
> +       printf("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no");
> +
> +      if (jvm_init_rv == 0)
> +       return JavaMain((void*)&args);
> +      else
> +       return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret);
>     }
>  }
>
>
> --- cacao/cacao/src/native/jni.c~       2008-09-10 18:42:21.000000000 +0200
> +++ cacao/cacao/src/native/jni.c        2009-03-02 22:33:23.000000000 +0100
> @@ -4295,6 +4295,8 @@
>
>  *******************************************************************************/
>
> +#define JNI_VERSION_CACAO 0xCACA0000
> +
>  jint JNI_GetDefaultJavaVMInitArgs(void *vm_args)
>  {
>        JavaVMInitArgs *_vm_args;
> @@ -4310,6 +4312,7 @@
>
>     case JNI_VERSION_1_2:
>     case JNI_VERSION_1_4:
> +    case JNI_VERSION_CACAO:
>                _vm_args->ignoreUnrecognized = JNI_FALSE;
>                _vm_args->options = NULL;
>                _vm_args->nOptions = 0;
>
>

Nice :)

Does this work on platforms where we would default to zero (ppc, arm, etc.)?
i.e. do you get zero as the main VM and cacao as the option?

I presume these are headed for the patches subdirectory? How about a
cacao subdirectory of patches rather than the cacao prefix to make
things easier?

Cheers,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8