diff options
Diffstat (limited to 'mips/rtl/java')
| -rw-r--r-- | mips/rtl/java/jastringh.inc | 1 | ||||
| -rw-r--r-- | mips/rtl/java/jastrings.inc | 7 | ||||
| -rw-r--r-- | mips/rtl/java/java_sysh.inc | 25 | ||||
| -rw-r--r-- | mips/rtl/java/jcompproc.inc | 2 | ||||
| -rw-r--r-- | mips/rtl/java/jsystemh.inc | 10 |
5 files changed, 38 insertions, 7 deletions
diff --git a/mips/rtl/java/jastringh.inc b/mips/rtl/java/jastringh.inc index 2a4fcb0ea4..1570e13749 100644 --- a/mips/rtl/java/jastringh.inc +++ b/mips/rtl/java/jastringh.inc @@ -26,6 +26,7 @@ type constructor Create(len: longint; cp: TSystemCodePage);overload; constructor Create(const arr: array of ansichar; length: longint; cp: TSystemCodePage);overload; constructor Create(const arr: array of unicodechar; cp: TSystemCodePage);overload; + constructor Create(const u: unicodestring);overload; constructor Create(const u: unicodestring; cp: TSystemCodePage);overload; constructor Create(const a: RawByteString; cp: TSystemCodePage);overload; constructor Create(const s: shortstring; cp: TSystemCodePage);overload; diff --git a/mips/rtl/java/jastrings.inc b/mips/rtl/java/jastrings.inc index 6eccb4827f..276f7829ca 100644 --- a/mips/rtl/java/jastrings.inc +++ b/mips/rtl/java/jastrings.inc @@ -79,6 +79,13 @@ begin end; +constructor AnsistringClass.Create(const u: unicodestring); +begin + { for use in Java code } + Create(u,DefaultSystemCodePage); +end; + + constructor AnsistringClass.Create(const a: RawByteString; cp: TSystemCodePage); begin Create(AnsistringClass(a).fdata,system.length(AnsistringClass(a).fdata)-1,cp); diff --git a/mips/rtl/java/java_sysh.inc b/mips/rtl/java/java_sysh.inc index 540e49f8a2..129399a09f 100644 --- a/mips/rtl/java/java_sysh.inc +++ b/mips/rtl/java/java_sysh.inc @@ -1,4 +1,27 @@ -{ Imports for Java packages/classes: java.io.IIOException, java.io.IOException, java.io.Serializable, java.lang.AbstractStringBuilder, java.lang.Appendable, java.lang.AssertionError, java.lang.Boolean, java.lang.Byte, java.lang.CharSequence, java.lang.Character, java.lang.Class, java.lang.Cloneable, java.lang.Comparable, java.lang.Double, java.lang.Enum, java.lang.Error, java.lang.Exception, java.lang.Float, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.IndexOutOfBoundsException, java.lang.Integer, java.lang.Iterable, java.lang.LinkageError, java.lang.Long, java.lang.Math, java.lang.NoSuchMethodException, java.lang.Number, java.lang.Object, java.lang.Readable, java.lang.Runtime, java.lang.RuntimeException, java.lang.Short, java.lang.String, java.lang.StringBuffer, java.lang.StringBuilder, java.lang.System, java.lang.ThreadLocal, java.lang.Throwable, java.lang.UnsupportedOperationException, java.lang.reflect.AccessibleObject, java.lang.reflect.AnnotatedElement, java.lang.reflect.Array, java.lang.reflect.Field, java.lang.reflect.GenericDeclaration, java.lang.reflect.InvocationTargetException, java.lang.reflect.Member, java.lang.reflect.Method, java.lang.reflect.Type, java.math.BigInteger, java.nio.Buffer, java.nio.ByteBuffer, java.nio.CharBuffer, java.nio.charset., java.text.Collator, java.util.AbstractCollection, java.util.AbstractMap, java.util.AbstractSet, java.util.Arrays, java.util.BitSet, java.util.Calendar, java.util.Collection, java.util.Comparator, java.util.EnumSet, java.util.HashMap, java.util.Iterator, java.util.Map, java.util.Set } +{ Imports for Java packages/classes: + java.io.IIOException, java.io.IOException, java.io.Serializable, + java.lang.AbstractStringBuilder, java.lang.Appendable, + java.lang.AssertionError, java.lang.Boolean, java.lang.Byte, + java.lang.CharSequence, java.lang.Character, java.lang.Class, + java.lang.Cloneable, java.lang.Comparable, java.lang.Double, + java.lang.Enum, java.lang.Error, java.lang.Exception, java.lang.Float, + java.lang.IllegalArgumentException, java.lang.IllegalStateException, + java.lang.IndexOutOfBoundsException, java.lang.Integer, java.lang.Iterable, + java.lang.LinkageError, java.lang.Long, java.lang.Math, + java.lang.NoSuchMethodException, java.lang.Number, java.lang.Object, + java.lang.Readable, java.lang.Runtime, java.lang.RuntimeException, + java.lang.Short, java.lang.String, java.lang.StringBuffer, + java.lang.StringBuilder, java.lang.System, java.lang.ThreadLocal, + java.lang.Throwable, java.lang.UnsupportedOperationException, + java.lang.reflect.AccessibleObject, java.lang.reflect.AnnotatedElement, + java.lang.reflect.Array, java.lang.reflect.Field, + java.lang.reflect.GenericDeclaration, java.lang.reflect.InvocationTargetException, + java.lang.reflect.Member, java.lang.reflect.Method, java.lang.reflect.Type, + java.math.BigInteger, java.nio.Buffer, java.nio.ByteBuffer, java.nio.CharBuffer, + java.nio.charset., java.text.Collator, java.util.AbstractCollection, + java.util.AbstractMap, java.util.AbstractSet, java.util.Arrays, java.util.BitSet, + java.util.Calendar, java.util.Collection, java.util.Comparator, java.util.EnumSet, + java.util.HashMap, java.util.Iterator, java.util.Map, java.util.Set } type JLNoSuchMethodException = class; Arr1JLNoSuchMethodException = array of JLNoSuchMethodException; diff --git a/mips/rtl/java/jcompproc.inc b/mips/rtl/java/jcompproc.inc index 49403c5655..68a9d8bb46 100644 --- a/mips/rtl/java/jcompproc.inc +++ b/mips/rtl/java/jcompproc.inc @@ -376,7 +376,7 @@ procedure fpc_variant_init(var v: tvardata);compilerproc; procedure fpc_variant_clear(var v: tvardata);compilerproc; {$ifdef FPC_VARIANTCOPY_FIXED} procedure fpc_variant_copy(var d: tvardata; const s : tvardata);compilerproc; -procedure fpc_variant_copy_overwrite(const source: tvardata; var dest : tvardata);compilerproc; +procedure fpc_variant_copy_overwrite(constref source: tvardata; var dest : tvardata);compilerproc; {$else FPC_VARIANTCOPY_FIXED} procedure fpc_variant_copy(d,s : pointer);compilerproc; procedure fpc_variant_copy_overwrite(source, dest : pointer);compilerproc; diff --git a/mips/rtl/java/jsystemh.inc b/mips/rtl/java/jsystemh.inc index 583e93b440..e21e2c6bc7 100644 --- a/mips/rtl/java/jsystemh.inc +++ b/mips/rtl/java/jsystemh.inc @@ -169,7 +169,7 @@ Function Random: extended; Procedure Randomize; {$endif FPC_HAS_FEATURE_RANDOM} -{$ifdef FPC_HAS_INTERNAL_ABS_LONG and (defined(cpui386) or defined(cpux86_64) or defined(cpupowerpc))} +{$ifdef FPC_HAS_INTERNAL_ABS_LONG} {$define FPC_SYSTEM_HAS_ABS_LONGINT} Function abs(l:longint):longint;[internproc:fpc_in_abs_long]; {$else FPC_HAS_INTERNAL_ABS_LONG} @@ -591,15 +591,15 @@ Procedure getdir(drivenr:byte;var dir:ansistring); //function get_frame:pointer;[INTERNPROC:fpc_in_get_frame]; (* // still defined externally -function get_caller_addr(framebp:pointer):pointer;[INTERNPROC:fpc_in_get_caller_addr]; -function get_caller_frame(framebp:pointer):pointer;[INTERNPROC:fpc_in_get_caller_frame]; +function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;[INTERNPROC:fpc_in_get_caller_addr]; +function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer;[INTERNPROC:fpc_in_get_caller_frame]; *) {$ELSE} function get_frame:pointer;{$ifdef SYSTEMINLINE}inline;{$endif} {$ENDIF} (* -function get_caller_addr(framebp:pointer):pointer; -function get_caller_frame(framebp:pointer):pointer; +function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer; +function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer; *) //Function IOResult:Word; |