paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 17:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* pas2jni: Fixed handling of pointers.

Browse Source 
git-svn-id: trunk@32620 -
This commit is contained in:
yury 2015-12-08 17:01:29 +00:00
parent ed03286be5
commit 6bd2b2d41b
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
utils/pas2jni/writer.pas
View File

@ -102,7 +102,7 @@ type
procedure WriteEnum(d: TDef); procedure WriteEnum(d: TDef);
procedure WriteProcType(d: TProcDef; PreInfo: boolean); procedure WriteProcType(d: TProcDef; PreInfo: boolean);
procedure WriteSet(d: TSetDef); procedure WriteSet(d: TSetDef);
procedure WritePointer(d: TPointerDef); procedure WritePointer(d: TPointerDef; PreInfo: boolean);
procedure WriteUnit(u: TUnitDef); procedure WriteUnit(u: TUnitDef);
procedure WriteOnLoad; procedure WriteOnLoad;
public public
@ -937,7 +937,7 @@ begin
for i:=0 to tempvars.Count - 1 do begin for i:=0 to tempvars.Count - 1 do begin
vd:=TVarDef(tempvars.Objects[i]); vd:=TVarDef(tempvars.Objects[i]);
if IsJavaSimpleType(vd.VarType) then if IsJavaSimpleType(vd.VarType) then
Fps.WriteLn(Format('_env^^.Release%sArrayElements(_env, %s, %s_arr, 0);', [JavaType[TTypeDef(vd.VarType).BasicType], vd.Name, tempvars[i]])); Fps.WriteLn(Format('_env^^.Release%sArrayElements(_env, %s, %s_arr, 0);', [GetJniFuncType(vd.VarType), vd.Name, tempvars[i]]));
end; end;
end; end;
@ -1192,7 +1192,7 @@ begin
end; end;
Fjs.WriteLn; Fjs.WriteLn;
for i:=0 to d.Count - 1 do begin for i:=0 to d.Count - 1 do begin
s:=Format('public final static %s %s() { return new %0:s(%1:s); }', [d.Name, d[i].Name]); s:=Format('public static %s %s() { return new %0:s(%1:s); }', [d.Name, d[i].Name]);
Fjs.WriteLn(s); Fjs.WriteLn(s);
end; end;
Fjs.WriteLn; Fjs.WriteLn;
@ -1384,13 +1384,16 @@ begin
Fjs.WriteLn; Fjs.WriteLn;
end; end;
procedure TWriter.WritePointer(d: TPointerDef); procedure TWriter.WritePointer(d: TPointerDef; PreInfo: boolean);
begin begin
if not d.IsUsed or not d.IsObjPtr then if not d.IsUsed or not d.IsObjPtr then
exit; exit;
if PreInfo then begin
WriteComment(d, 'pointer'); WriteComment(d, 'pointer');
RegisterPseudoClass(d); RegisterPseudoClass(d);
WriteClassInfoVar(d); WriteClassInfoVar(d);
exit;
end;
Fjs.WriteLn(Format('public static class %s extends %s {', [d.Name, d.PtrType.Name])); Fjs.WriteLn(Format('public static class %s extends %s {', [d.Name, d.PtrType.Name]));
Fjs.IncI; Fjs.IncI;
@ -1636,6 +1639,8 @@ begin
WriteClass(TClassDef(d), True); WriteClass(TClassDef(d), True);
dtProcType: dtProcType:
WriteProcType(TProcDef(d), True); WriteProcType(TProcDef(d), True);
dtPointer:
WritePointer(TPointerDef(d), True);
end; end;
end; end;
@ -1660,7 +1665,7 @@ begin
dtConst: dtConst:
WriteConst(TConstDef(d)); WriteConst(TConstDef(d));
dtPointer: dtPointer:
WritePointer(TPointerDef(d)); WritePointer(TPointerDef(d), False);
end; end;
end; end;
@ -1823,7 +1828,7 @@ begin
dtPointer: dtPointer:
begin begin
if TPointerDef(d).IsObjPtr then if TPointerDef(d).IsObjPtr then
Result:=Format('%s.%s(_GetPasObj(_env, %s, %s, True))', [d.Parent.Name, d.Name, Result, GetTypeInfoVar(d)]) Result:=Format('%s.%s(_GetPasObj(_env, %s, %s, False))', [d.Parent.Name, d.Name, Result, GetTypeInfoVar(d)])
else else
Result:=Format('pointer(ptruint(%s))', [Result]); Result:=Format('pointer(ptruint(%s))', [Result]);
end; end;
@ -1900,7 +1905,16 @@ end;
function TWriter.IsJavaSimpleType(d: TDef): boolean; function TWriter.IsJavaSimpleType(d: TDef): boolean;
begin begin
Result:=(d <> nil) and (d.DefType = dtType) and (Length(JNITypeSig[TTypeDef(d).BasicType]) = 1); Result:=d <> nil;
if Result then
case d.DefType of
dtType:
Result:=Length(JNITypeSig[TTypeDef(d).BasicType]) = 1;
dtPointer:
Result:=not TPointerDef(d).IsObjPtr;
else
Result:=False;
end;
end; end;
function TWriter.IsJavaVarParam(ParamDef: TVarDef): boolean; function TWriter.IsJavaVarParam(ParamDef: TVarDef): boolean;
@ -2001,8 +2015,12 @@ end;
function TWriter.GetJniFuncType(d: TDef): string; function TWriter.GetJniFuncType(d: TDef): string;
begin begin
if IsJavaSimpleType(d) then begin if IsJavaSimpleType(d) then begin
if d.DefType = dtPointer then
Result:='Long'
else begin
Result:=JavaType[TTypeDef(d).BasicType]; Result:=JavaType[TTypeDef(d).BasicType];
Result[1]:=UpCase(Result[1]); Result[1]:=UpCase(Result[1]);
end;
end end
else else
Result:='Object'; Result:='Object';