hg/stx-libjava: comparison JavaVM.st

equal deleted inserted replaced

-:eaf900eded11
+:482ad5ebe5da
 "Created: / 10-08-2011 / 14:02:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 commonOpen:nativeContext forAppend:forAppend
-|fs fd fn name dir stream fileNo readonly|
+|fs fd fn nm dir stream fileNo readonly|
 fs := nativeContext receiver.
 fd := fs instVarNamed:'fd'.
 (fd instVarNamed:'fd') ~~ -1 ifTrue:[
 "/self halt:'file already open'.
 self internalError:'file already open'.
 ^ self.
 ].
-name := nativeContext argAt:1.
+nm := nativeContext argAt:1.
-name := Java as_ST_String:name.
+nm := Java as_ST_String:nm.
 FileOpenTrace ifTrue:[
-('JAVA: opening ' , name) infoPrintCR.
+('JAVA: opening ' , nm) infoPrintCR.
 ].
-fn := name utf8Decoded asFilename.
+fn := nm utf8Decoded asFilename.
 dir := fn directory pathName.
 readonly := false.
 "/    (PermittedDirectories notNil
 "/    and:[PermittedDirectories includes:dir]) ifFalse:[
 ] ifFalse:[
 stream := self commonOpenStreamUsing:[fn writeStream].
 ]
 ].
 stream isNil ifTrue:[
-self throwIOExceptionWithMessage:('cannot open ' , name , ' for writing').
+self throwIOExceptionWithMessage:('cannot open ' , nm , ' for writing').
 ].
+stream binary.
 fileNo := self addOpenFile:stream.
 FileOpenTrace ifTrue:[
-('JAVA: opened ' , name , ' as FD ' , fileNo printString , ' for writing') infoPrintCR.
+('JAVA: opened ' , nm , ' as FD ' , fileNo printString , ' for writing') infoPrintCR.
 ].
 fd instVarNamed:'fd' put:fileNo.
 "Kludge for finalization..."
 fs finalizationLobby registerChange: fs
 "Created: / 07-04-1998 / 19:14:09 / cg"
 "Modified: / 04-01-1999 / 14:34:42 / cg"
-"Modified: / 23-07-2012 / 19:38:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 12-12-2012 / 23:43:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 commonOpenStreamUsing: aBlock
 "Helper for opening a stream. Catches 'too many files' open error
 and tries to GC to cleanup if necessary"
 |file byte|
 file := self validateFile:(nativeContext receiver).
 file == Stdin ifTrue:[
-	file := StdinReplacementFileQuerySignal raiseRequest.
+file := StdinReplacementFileQuerySignal raiseRequest.
-	file isNil ifTrue:[
+file isNil ifTrue:[
-	    ^ -1
+^ -1
-	]
+]
 ].
 FileIOTrace ifTrue:[
-	('JAVA: read 1 byte from ' , file pathName) infoPrintCR.
+('JAVA: read 1 byte from ' , file pathName) infoPrintCR.
 ].
 byte := file nextByte.
 byte isNil ifTrue:[
-	^ -1
+^ -1
+].
+"Java bytes are signed"
+byte > 127 ifTrue:[
+byte :=
+byte"/ - 255.
 ].
 ^ byte
-"Created: / 5.1.1998 / 02:17:08 / cg"
+"Created: / 05-01-1998 / 02:17:08 / cg"
-"Modified: / 5.1.1998 / 02:17:25 / cg"
+"Modified (format): / 12-12-2012 / 23:53:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 _java_io_FileInputStream_readBytes: nativeContext
 <javanative: 'java/io/FileInputStream' name: 'readBytes'>
 public native void write(int b) throws IOException;
 "
 | fdobj fd stream b |
 b := nativeContext argAt:1.
+"/Java byte is signed, make it integer in 0-255"
+b < 0 ifTrue:[b := b + 255].
 fdobj := (nativeContext receiver instVarNamed: #fd).
 fd    := fdobj instVarNamed: #fd.
 stream := self getOpenFileAt:fd.
 [
-stream nextPut: b asCharacter
+stream nextPut: b
 ] on: Error do:[:ex|
 self throwIOExceptionWithMessage: ex description
 ]
-"Modified: / 10-08-2011 / 14:15:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 12-12-2012 / 23:46:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 _java_io_FileOutputStream_writeBytes: nativeContext
 <javanative: 'java/io/FileOutputStream' name: 'writeBytes'>
 "
 | f |
 f := aJavaContext argAt:1.
 f class == Float ifFalse:[ ^self throwIllegalArgumentException: 'Not a float'].
 %{
-{
+__int64__ *i = &(__floatVal(f));
-double d = __floatVal(f);
+RETURN (__MKINT64( i ));
-RETURN (__MKINT64( &d ));
-}
 %}.
 self primitiveFailed.
 "Created: / 10-11-2010 / 14:48:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 11-12-2012 / 22:32:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 15-12-2012 / 14:40:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 _java_lang_Double_longBitsToDouble: nativeContext
 <javanative: 'java/lang/Double' name: 'longBitsToDouble'>
 f := Float new.
 %{
 __floatVal(f) = (double)(__longIntVal(i));
 %}.
 ^f
-"Created: / 04-01-1998 / 01:45:00 / cg"
-"Modified: / 11-12-2012 / 21:58:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 _java_lang_Float_floatToRawIntBits: aJavaContext
 <javanative: 'java/lang/Float' name: 'floatToRawIntBits'>
 * @param   value   a floating-point number.
 * @return the bits that represent the floating-point number.
 * @since 1.3
 */
 "
-| f |
+| f b |
 f := aJavaContext argAt:1.
 f class == ShortFloat ifFalse:[ self throwIllegalArgumentException: 'Not a float'].
 %{
-{
+int i;
-int *i = &(__shortFloatVal(f));
+i = (int)(__shortFloatVal(f));
-printf(">> F2raw bits: f=%f i=0x%04x\n", __shortFloatVal(f), *i);
+RETURN (__MKINT(i));
-RETURN (__MKINT(*i));
-}
 %}.
 self primitiveFailed.
 "Created: / 09-11-2010 / 20:59:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified (format): / 11-12-2012 / 21:56:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 07-08-2011 / 21:45:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 _java_lang_Float_intBitsToFloat: nativeContext
 <javanative: 'java/lang/Float' name: 'intBitsToFloat(I)F'>
 f := ShortFloat new.
 %{
 __shortFloatVal(f) = (float)(__intVal(i));
 %}.
 ^f
-"Modified: / 11-12-2012 / 21:53:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 _java_lang_Object_clone: nativeContext
 <javanative: 'java/lang/Object' name: 'clone'>

branch	development
changeset 1876	482ad5ebe5da
parent 1867	cd4ec4fbe798
child 1877	14cbc77e9aaa