Skip to content

Commit

Permalink
Merge pull request #639 from dkimitsa/fix/123-unalligned-pointers
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tom-Ski
Tom-Ski authored Apr 24, 2022
2 parents ff6c0e7 + 1ea01a4 commit ada357a
Show file tree
Hide file tree
Showing 12 changed files with 227 additions and 114 deletions.
97 changes: 49 additions & 48 deletions compiler/compiler/src/main/java/org/robovm/compiler/AttributesEncoder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
import org.robovm.compiler.llvm.Global;
import org.robovm.compiler.llvm.IntegerConstant;
import org.robovm.compiler.llvm.Linkage;
import org.robovm.compiler.llvm.PackedStructureConstant;
import org.robovm.compiler.llvm.PackedStructureType;
import org.robovm.compiler.llvm.StructureConstant;
import org.robovm.compiler.llvm.StructureType;
import org.robovm.compiler.llvm.StructureConstant;
import org.robovm.compiler.llvm.Type;
import org.robovm.compiler.llvm.Value;
Expand Down Expand Up @@ -92,10 +92,10 @@ public class AttributesEncoder {

public void encode(ModuleBuilder mb, SootClass sootClass) {
this.mb = mb;
dependencies = new HashSet<String>();
dependencies = new HashSet<>();
classAttributes = null;
fieldAttributes = new HashMap<SootField, Global>();
methodAttributes = new HashMap<SootMethod, Global>();
fieldAttributes = new HashMap<>();
methodAttributes = new HashMap<>();

encodeAttributes(sootClass);
Constant classAttributes = encodeAttributes(sootClass);
Expand Down Expand Up @@ -152,21 +152,21 @@ public Global getMethodAttributes(SootMethod m) {
return methodAttributes.get(m);
}

private PackedStructureType getAnnotationElementType(AnnotationElem ae) {
private StructureType getAnnotationElementType(AnnotationElem ae) {
if (ae instanceof AnnotationIntElem) {
return new PackedStructureType(I8, I32);
return new StructureType(I8, I32);
} else if (ae instanceof AnnotationLongElem) {
return new PackedStructureType(I8, I64);
return new StructureType(I8, I64);
} else if (ae instanceof AnnotationFloatElem) {
return new PackedStructureType(I8, FLOAT);
return new StructureType(I8, FLOAT);
} else if (ae instanceof AnnotationDoubleElem) {
return new PackedStructureType(I8, DOUBLE);
return new StructureType(I8, DOUBLE);
} else if (ae instanceof AnnotationStringElem) {
return new PackedStructureType(I8, I8_PTR);
return new StructureType(I8, I8_PTR);
} else if (ae instanceof AnnotationClassElem) {
return new PackedStructureType(I8, I8_PTR);
return new StructureType(I8, I8_PTR);
} else if (ae instanceof AnnotationEnumElem) {
return new PackedStructureType(I8, I8_PTR, I8_PTR);
return new StructureType(I8, I8_PTR, I8_PTR);
} else if (ae instanceof AnnotationArrayElem) {
AnnotationArrayElem aae = (AnnotationArrayElem) ae;
Type[] types = new Type[aae.getNumValues() + 2];
Expand All @@ -175,46 +175,46 @@ private PackedStructureType getAnnotationElementType(AnnotationElem ae) {
for (int i = 0; i < aae.getNumValues(); i++) {
types[i + 2] = getAnnotationElementType(aae.getValueAt(i));
}
return new PackedStructureType(types);
return new StructureType(types);
} else if (ae instanceof AnnotationAnnotationElem) {
AnnotationAnnotationElem aae = (AnnotationAnnotationElem) ae;
return new PackedStructureType(I8, getAnnotationTagType(aae.getValue()));
return new StructureType(I8, getAnnotationTagType(aae.getValue()));
}
throw new IllegalArgumentException("Unknown AnnotationElem type: " + ae.getClass());
}

private PackedStructureConstant encodeAnnotationElementValue(AnnotationElem ae) {
PackedStructureType type = getAnnotationElementType(ae);
private StructureConstant encodeAnnotationElementValue(AnnotationElem ae) {
StructureType type = getAnnotationElementType(ae);
Value kind = new IntegerConstant((byte) ae.getKind());
if (ae instanceof AnnotationIntElem) {
AnnotationIntElem aie = (AnnotationIntElem) ae;
return new PackedStructureConstant(type, kind,
return new StructureConstant(type, kind,
new IntegerConstant(aie.getValue()));
} else if (ae instanceof AnnotationLongElem) {
AnnotationLongElem ale = (AnnotationLongElem) ae;
return new PackedStructureConstant(type, kind,
return new StructureConstant(type, kind,
new IntegerConstant(ale.getValue()));
} else if (ae instanceof AnnotationFloatElem) {
AnnotationFloatElem afe = (AnnotationFloatElem) ae;
return new PackedStructureConstant(type, kind,
return new StructureConstant(type, kind,
new FloatingPointConstant(afe.getValue()));
} else if (ae instanceof AnnotationDoubleElem) {
AnnotationDoubleElem ade = (AnnotationDoubleElem) ae;
return new PackedStructureConstant(type, kind,
return new StructureConstant(type, kind,
new FloatingPointConstant(ade.getValue()));
} else if (ae instanceof AnnotationStringElem) {
AnnotationStringElem ase = (AnnotationStringElem) ae;
return new PackedStructureConstant(type, kind,
return new StructureConstant(type, kind,
getStringOrNull(ase.getValue()));
} else if (ae instanceof AnnotationClassElem) {
AnnotationClassElem ace = (AnnotationClassElem) ae;
addDependencyIfNeeded(ace.getDesc());
return new PackedStructureConstant(type, kind,
return new StructureConstant(type, kind,
getStringOrNull(ace.getDesc()));
} else if (ae instanceof AnnotationEnumElem) {
AnnotationEnumElem aee = (AnnotationEnumElem) ae;
addDependencyIfNeeded(aee.getTypeName());
return new PackedStructureConstant(type, kind,
return new StructureConstant(type, kind,
getStringOrNull(aee.getTypeName()),
getStringOrNull(aee.getConstantName()));
} else if (ae instanceof AnnotationArrayElem) {
Expand All @@ -225,26 +225,26 @@ private PackedStructureConstant encodeAnnotationElementValue(AnnotationElem ae)
for (int i = 0; i < aae.getNumValues(); i++) {
values[i + 2] = encodeAnnotationElementValue(aae.getValueAt(i));
}
return new PackedStructureConstant(type, values);
return new StructureConstant(type, values);
} else if (ae instanceof AnnotationAnnotationElem) {
AnnotationAnnotationElem aae = (AnnotationAnnotationElem) ae;
return new PackedStructureConstant(type, kind, encodeAnnotationTagValue(aae.getValue()));
return new StructureConstant(type, kind, encodeAnnotationTagValue(aae.getValue()));
}
throw new IllegalArgumentException("Unknown AnnotationElem type: " + ae.getClass());
}

private PackedStructureType getAnnotationTagType(AnnotationTag tag) {
private StructureType getAnnotationTagType(AnnotationTag tag) {
Type[] types = new Type[tag.getNumElems() * 2 + 2];
types[0] = I8_PTR;
types[1] = I32;
for (int i = 0; i < tag.getNumElems(); i++) {
types[i * 2 + 2] = I8_PTR;
types[i * 2 + 2 + 1] = getAnnotationElementType(tag.getElemAt(i));
}
return new PackedStructureType(types);
return new StructureType(types);
}

private PackedStructureConstant encodeAnnotationTagValue(AnnotationTag tag) {
private StructureConstant encodeAnnotationTagValue(AnnotationTag tag) {
Value[] values = new Value[tag.getNumElems() * 2 + 2];
values[0] = getString(tag.getType());
addDependencyIfNeeded(tag.getType());
Expand All @@ -253,39 +253,39 @@ private PackedStructureConstant encodeAnnotationTagValue(AnnotationTag tag) {
values[i * 2 + 2] = getString(tag.getElemAt(i).getName());
values[i * 2 + 2 + 1] = encodeAnnotationElementValue(tag.getElemAt(i));
}
return new PackedStructureConstant(getAnnotationTagType(tag), values);
return new StructureConstant(getAnnotationTagType(tag), values);
}

private Constant encodeAttributes(Host host) {
List<Value> attributes = new ArrayList<Value>();
List<Value> attributes = new ArrayList<>();
for (Tag tag : host.getTags()) {
if (tag instanceof SourceFileTag) {
// Skip. We don't need this at this time.
Value sourceFile = getString(((SourceFileTag) tag).getSourceFile());
attributes.add(new PackedStructureConstant(new PackedStructureType(I8, I8_PTR),
attributes.add(new StructureConstant(new StructureType(I8, I8_PTR),
new IntegerConstant(SOURCE_FILE), sourceFile));
} else if (tag instanceof EnclosingMethodTag) {
EnclosingMethodTag emt = (EnclosingMethodTag) tag;
Value eClass = getString(emt.getEnclosingClass());
Value eMethod = getStringOrNull(emt.getEnclosingMethod());
Value eDesc = getStringOrNull(emt.getEnclosingMethodSig());
attributes.add(new PackedStructureConstant(new PackedStructureType(I8, I8_PTR, I8_PTR, I8_PTR),
attributes.add(new StructureConstant(new StructureType(I8, I8_PTR, I8_PTR, I8_PTR),
new IntegerConstant(ENCLOSING_METHOD), eClass, eMethod, eDesc));
} else if (tag instanceof SignatureTag) {
Value signature = getString(((SignatureTag) tag).getSignature());
attributes.add(new PackedStructureConstant(new PackedStructureType(I8, I8_PTR),
attributes.add(new StructureConstant(new StructureType(I8, I8_PTR),
new IntegerConstant(SIGNATURE), signature));
} else if (tag instanceof InnerClassTag) {
InnerClassTag ict = (InnerClassTag) tag;
Value innerClass = getStringOrNull(ict.getInnerClass());
Value outerClass = getStringOrNull(ict.getOuterClass());
Value innerName = getStringOrNull(ict.getShortName());
Value innerClassAccess = new IntegerConstant(ict.getAccessFlags());
attributes.add(new PackedStructureConstant(new PackedStructureType(I8, I8_PTR, I8_PTR, I8_PTR, I32),
attributes.add(new StructureConstant(new StructureType(I8, I8_PTR, I8_PTR, I8_PTR, I32),
new IntegerConstant(INNER_CLASS), innerClass, outerClass, innerName, innerClassAccess));
} else if (tag instanceof AnnotationDefaultTag) {
StructureConstant value = encodeAnnotationElementValue(((AnnotationDefaultTag) tag).getDefaultVal());
attributes.add(new PackedStructureConstant(new PackedStructureType(I8, value.getType()),
attributes.add(new StructureConstant(new StructureType(I8, value.getType()),
new IntegerConstant(ANNOTATION_DEFAULT), value));
} else if (tag instanceof VisibilityAnnotationTag) {
VisibilityAnnotationTag vat = (VisibilityAnnotationTag) tag;
Expand All @@ -298,14 +298,14 @@ private Constant encodeAttributes(Host host) {
types[i] = values[i].getType();
i++;
}
attributes.add(new PackedStructureConstant(new PackedStructureType(I8, I32, new PackedStructureType(types)),
attributes.add(new StructureConstant(new StructureType(I8, I32, new StructureType(types)),
new IntegerConstant(RUNTIME_VISIBLE_ANNOTATIONS), new IntegerConstant(vat.getAnnotations().size()),
new PackedStructureConstant(new PackedStructureType(types), values)));
new StructureConstant(new StructureType(types), values)));
}
} else if (tag instanceof VisibilityParameterAnnotationTag) {
VisibilityParameterAnnotationTag vpat = (VisibilityParameterAnnotationTag) tag;
List<Type> typesList = new ArrayList<Type>();
List<Value> valuesList = new ArrayList<Value>();
List<Type> typesList = new ArrayList<>();
List<Value> valuesList = new ArrayList<>();
boolean hasRuntimeVisible = false;
for (VisibilityAnnotationTag vat : vpat.getVisibilityAnnotations()) {
typesList.add(I32);
Expand All @@ -315,19 +315,20 @@ private Constant encodeAttributes(Host host) {
hasRuntimeVisible = true;
valuesList.add(new IntegerConstant(vat.getAnnotations().size()));
for (AnnotationTag at : vat.getAnnotations()) {
valuesList.add(encodeAnnotationTagValue(at));
typesList.add(valuesList.get(valuesList.size() - 1).getType());
StructureConstant value = encodeAnnotationTagValue(at);
valuesList.add(value);
typesList.add(value.getType());
}
} else {
valuesList.add(new IntegerConstant(0));
}
}
if (hasRuntimeVisible) {
Type[] types = typesList.toArray(new Type[typesList.size()]);
Value[] values = valuesList.toArray(new Value[valuesList.size()]);
attributes.add(new PackedStructureConstant(new PackedStructureType(I8, I32, new PackedStructureType(types)),
Type[] types = typesList.toArray(new Type[0]);
Value[] values = valuesList.toArray(new Value[0]);
attributes.add(new StructureConstant(new StructureType(I8, I32, new StructureType(types)),
new IntegerConstant(RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS), new IntegerConstant(vpat.getVisibilityAnnotations().size()),
new PackedStructureConstant(new PackedStructureType(types), values)));
new StructureConstant(new StructureType(types), values)));
}
}
}
Expand All @@ -340,7 +341,7 @@ private Constant encodeAttributes(Host host) {
values[i] = getString(exName);
addDependency(exName);
}
attributes.add(new PackedStructureConstant(new PackedStructureType(I8, I32, new ArrayType(exceptions.size(), I8_PTR)),
attributes.add(new StructureConstant(new StructureType(I8, I32, new ArrayType(exceptions.size(), I8_PTR)),
new IntegerConstant(EXCEPTIONS), new IntegerConstant(exceptions.size()),
new ArrayConstant(new ArrayType(exceptions.size(), I8_PTR), values)));
}
Expand All @@ -356,7 +357,7 @@ private Constant encodeAttributes(Host host) {
for (int i = 0; i < types.length; i++) {
types[i] = attributes.get(i).getType();
}
return new PackedStructureConstant(new PackedStructureType(types), attributes.toArray(new Value[0]));
return new StructureConstant(new StructureType(types), attributes.toArray(new Value[0])).flatten();
}

private Constant getString(String string) {
Expand Down
3 changes: 1 addition & 2 deletions compiler/compiler/src/main/java/org/robovm/compiler/ClassCompiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import org.robovm.compiler.llvm.Load;
import org.robovm.compiler.llvm.NullConstant;
import org.robovm.compiler.llvm.Ordering;
import org.robovm.compiler.llvm.PackedStructureConstantBuilder;
import org.robovm.compiler.llvm.PointerType;
import org.robovm.compiler.llvm.Ret;
import org.robovm.compiler.llvm.Store;
Expand Down Expand Up @@ -1304,7 +1303,7 @@ private StructureConstant createClassInfoStruct() {
header.add(new IntegerConstant((short) countReferences(classFields)));
header.add(new IntegerConstant((short) countReferences(instanceFields)));

PackedStructureConstantBuilder body = new PackedStructureConstantBuilder();
StructureConstantBuilder body = new StructureConstantBuilder();
body.add(new IntegerConstant((short) sootClass.getInterfaceCount()));
body.add(new IntegerConstant((short) sootClass.getFieldCount()));
body.add(new IntegerConstant((short) sootClass.getMethodCount()));
Expand Down
28 changes: 28 additions & 0 deletions compiler/compiler/src/main/java/org/robovm/compiler/llvm/StructureConstant.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
*/
package org.robovm.compiler.llvm;

import java.util.ArrayList;
import java.util.List;

/**
*
* @version $Id$
Expand All @@ -34,6 +37,31 @@ public StructureType getType() {
return type;
}



// flatten all contained structs in way removing struct and inserting struct members
private static void flattenInto(List<Value> dest, StructureConstant struct) {
for (Value v: struct.values) {
if (v instanceof StructureConstant)
flattenInto(dest, (StructureConstant)v);
else
dest.add(v);
}
}

public StructureConstant flatten() {
List<Value> flattenValues = new ArrayList<>();
flattenInto(flattenValues, this);

Type[] types = new Type[flattenValues.size()];
int i = 0;
for (Value v : flattenValues) {
types[i++] = v.getType();
}

return new StructureConstant(new StructureType(types), flattenValues.toArray(new Value[0]));
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
Expand Down
11 changes: 1 addition & 10 deletions compiler/compiler/src/main/java/org/robovm/compiler/target/ios/IOSTarget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,27 +288,18 @@ protected void doBuild(File outFile, List<String> ccArgs,
ccArgs.add("--target=" + config.getClangTriple(getMinimumOSVersion()));

if (isDeviceArch(arch)) {
if (config.isDebug()) {
ccArgs.add("-Wl,-no_pie");
}
if (config.isEnableBitcode()) {
// tells clang to keep bitcode while linking
ccArgs.add("-fembed-bitcode");
}
} else {
if (config.getArch().getCpuArch() == CpuArch.x86 || config.isDebug()) {
if (config.getArch().getCpuArch() == CpuArch.x86) {
ccArgs.add("-Wl,-no_pie");
}
}
ccArgs.add("-isysroot");
ccArgs.add(sdk.getRoot().getAbsolutePath());

// specify sdk version for linker
libArgs.add("-Xlinker");
libArgs.add("-sdk_version");
libArgs.add("-Xlinker");
libArgs.add(sdk.getVersion());

// add runtime path to swift libs first to support swift-5 libs location
if (config.hasSwiftSupport()) {
libArgs.add("-Xlinker");
Expand Down
5 changes: 0 additions & 5 deletions compiler/compiler/src/main/java/org/robovm/compiler/util/ToolchainUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,6 @@ public static void link(Config config, List<String> args, List<File> objectFiles
for (File objectsFile : objectsFiles) {
opts.add("-Wl,-filelist," + objectsFile.getAbsolutePath());
}
/*
* See #123, ignore ld: warning: pointer not aligned at address [infostruct] message with Xcode 8.3
* unless we find a better solution
*/
opts.add("-w");
} else {
opts.add(config.getArch().is32Bit() ? "-m32" : "-m64");
for (File objectsFile : objectsFiles) {
Expand Down
Loading

0 comments on commit ada357a

Please sign in to comment.