major FreeBSD 2.1.6 compile trouble

[Mattias Johansson]

On  4 Sep, Simon Lindgren wrote:
> kaffe-0.9.1 gives me trouble when compiling it on my FreeBSD 2.1.6 system.
> 
> when compiling with the interpreter option (no jit) i get this:
> -----------------------------------------------
> gcc -g -O  -I. -I. -I./../../config -I../../config -I../../include
> -I./../../include -DINTERPRETER -I./intrp -DKVER=\"0.91\" -c -fPIC
> ./intrp/machine.c
> ./intrp/machine.c: In function `virtualMachine':
> ./intrp/machine.c:141: structure has no member named `exception_table_len'
> ./intrp/machine.c:152: structure has no member named `ins'
> ./intrp/machine.c:178: structure has no member named `code'
> ./intrp/machine.c:182: structure has no member named `codelen'
> 
> has anyone encountered this earlier? (do I need a newer version of FreeBSD?)
> 

Hello.

I have encountered the same problem and made a few changes which made it
all to compile correctly. So far this seems to work but I can't promise
anything.

There seems to be some changes made in the 'methods' struct so I made a
few changes in kaffe/kaffevm/intrp/machine.c 

from
<  if (meth->exception_table_len > 0 || (methaccflags & ACC_SYNCHRONISED))
to
>  if (meth->exception_table->length > 0 || (methaccflags & ACC_SYNCHRONISED))
and 
from 
< idx = meth->ins + (methaccflags & ACC_STATIC ? 0 : 1);
to
> idx = meth->idx + (methaccflags & ACC_STATIC ? 0 : 1);
and 
from
< code = (bytecode*)meth->code;
to
> code = (bytecode*)meth->c.bcode.code;
and finally
from 
< assert(npc < meth->codelen);
to
> assert(npc < meth->c.bcode.codelen);


/Mattias

===========================================================
|Mattias Johansson                                        |
|Home: +46-(0)31-203458                                   |
|Work: +46-(0)31-7036437   e-mail: matjo at erv.ericsson.se  |
|---------------------------------------------------------|
|    http://www.etek.chalmers.se/~e4johans/index.html     |
===========================================================