Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mk/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ CFLAGS=\
-Wmissing-field-initializers \
-Wcast-function-type-mismatch \
-Wsemicolon-before-method-body \
-Wsign-compare \
-g \
-I.
SWIFTFLAGS=-g -emit-library
Expand Down
4 changes: 2 additions & 2 deletions runtime/trampolines-arm64.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ struct XamarinCallState {

struct ParamIterator {
struct XamarinCallState *state;
int ngrn; // Next General-purpose Register Number
int nsrn; // Next SIMD and Floating-point Register Number
unsigned int ngrn; // Next General-purpose Register Number
unsigned int nsrn; // Next SIMD and Floating-point Register Number
size_t ngrn_offset; // Offset into the current general purpose register number
uint8_t *nsaa; // Next stacked argument address.

Expand Down
8 changes: 4 additions & 4 deletions runtime/trampolines-arm64.m
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@
bool is_hfa = is_struct && struct_length >= 2 && struct_length <= 4;
if (is_hfa) {
is_hfa = struct_name [0] == 'f' || struct_name [0] == 'd';
for (int i = 1; i < struct_length; i++)
for (size_t i = 1; i < struct_length; i++)
is_hfa &= struct_name [i] == struct_name [0];
}

int ngrn_registers_left = 8 - it->ngrn;
size_t ngrn_registers_left = 8 - it->ngrn;
bool read_register = ngrn_registers_left > 0;

if (size > 16 && !is_hfa) {
Expand Down Expand Up @@ -310,7 +310,7 @@
(size == 8 && !strncmp (struct_name, "d", 1))) {
LOGZ (" marshalling as %i doubles (struct name: %s)\n", (int) size / 8, struct_name);
double* ptr = (double *) mono_object_unbox (value);
for (int i = 0; i < size / 8; i++) {
for (size_t i = 0; i < size / 8; i++) {
LOGZ (" #%i: %f\n", i, ptr [i]);
it->q [i].q = ptr [i];
}
Expand All @@ -320,7 +320,7 @@
(size == 4 && !strncmp (struct_name, "f", 1))) {
LOGZ (" marshalling as %i floats (struct name: %s)\n", (int) size / 4, struct_name);
float* ptr = (float *) mono_object_unbox (value);
for (int i = 0; i < size / 4; i++) {
for (size_t i = 0; i < size / 4; i++) {
LOGZ (" #%i: %f\n", i, ptr [i]);
it->q [i].f.f1 = ptr [i];
}
Expand Down
2 changes: 1 addition & 1 deletion tests/test-libraries/libtest.m
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,7 @@ -(void) addObject: (WeakReferencedObject *) obj

-(void) callDoSomething: (int*) nilObjectCount nonNilObjectCount: (int *) nonNilObjectCount gotExpectedResponse: (int *) gotExpectedResponse gotUnexpectedResponse: (int *) gotUnexpectedResponse gotFinalizedResponse: (int *) gotFinalizedResponse
{
for (int i = 0; i < self.array.count; i++) {
for (unsigned int i = 0; i < self.array.count; i++) {
WeakReferencedObject *obj = (WeakReferencedObject *) [self.array pointerAtIndex: (NSUInteger) i];
if (obj) {
*nonNilObjectCount= *nonNilObjectCount + 1;
Expand Down