From f9110fc51edf8a23c3e103d360164dd70728d1c5 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 4 Feb 2015 02:35:30 -0800
Subject: [PATCH] ARM7: Make component numbers be size_t instead of int

---
 src/arm/arm.c                  | 8 ++++----
 src/arm/arm.h                  | 6 +++---
 src/debugger/memory-debugger.c | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/arm/arm.c b/src/arm/arm.c
index 30ce314eb..44419f257 100644
--- a/src/arm/arm.c
+++ b/src/arm/arm.c
@@ -71,7 +71,7 @@ static inline enum RegisterBank _ARMSelectBank(enum PrivilegeMode mode) {
 
 void ARMInit(struct ARMCore* cpu) {
 	cpu->master->init(cpu, cpu->master);
-	int i;
+	size_t i;
 	for (i = 0; i < cpu->numComponents; ++i) {
 		if (cpu->components[i] && cpu->components[i]->init) {
 			cpu->components[i]->init(cpu, cpu->components[i]);
@@ -83,7 +83,7 @@ void ARMDeinit(struct ARMCore* cpu) {
 	if (cpu->master->deinit) {
 		cpu->master->deinit(cpu->master);
 	}
-	int i;
+	size_t i;
 	for (i = 0; i < cpu->numComponents; ++i) {
 		if (cpu->components[i] && cpu->components[i]->deinit) {
 			cpu->components[i]->deinit(cpu->components[i]);
@@ -97,14 +97,14 @@ void ARMSetComponents(struct ARMCore* cpu, struct ARMComponent* master, int extr
 	cpu->components = extras;
 }
 
-void ARMHotplugAttach(struct ARMCore* cpu, int slot) {
+void ARMHotplugAttach(struct ARMCore* cpu, size_t slot) {
 	if (slot >= cpu->numComponents) {
 		return;
 	}
 	cpu->components[slot]->init(cpu, cpu->components[slot]);
 }
 
-void ARMHotplugDetach(struct ARMCore* cpu, int slot) {
+void ARMHotplugDetach(struct ARMCore* cpu, size_t slot) {
 	if (slot >= cpu->numComponents) {
 		return;
 	}
diff --git a/src/arm/arm.h b/src/arm/arm.h
index dc3e6915d..4af08b451 100644
--- a/src/arm/arm.h
+++ b/src/arm/arm.h
@@ -158,15 +158,15 @@ struct ARMCore {
 
 	struct ARMComponent* master;
 
-	int numComponents;
+	size_t numComponents;
 	struct ARMComponent** components;
 };
 
 void ARMInit(struct ARMCore* cpu);
 void ARMDeinit(struct ARMCore* cpu);
 void ARMSetComponents(struct ARMCore* cpu, struct ARMComponent* master, int extra, struct ARMComponent** extras);
-void ARMHotplugAttach(struct ARMCore* cpu, int slot);
-void ARMHotplugDetach(struct ARMCore* cpu, int slot);
+void ARMHotplugAttach(struct ARMCore* cpu, size_t slot);
+void ARMHotplugDetach(struct ARMCore* cpu, size_t slot);
 
 void ARMReset(struct ARMCore* cpu);
 void ARMSetPrivilegeMode(struct ARMCore*, enum PrivilegeMode);
diff --git a/src/debugger/memory-debugger.c b/src/debugger/memory-debugger.c
index 88a759d5c..6d4525466 100644
--- a/src/debugger/memory-debugger.c
+++ b/src/debugger/memory-debugger.c
@@ -20,7 +20,7 @@ static uint32_t _popcount32(unsigned bits) {
 #define FIND_DEBUGGER(DEBUGGER, CPU) \
 	{ \
 		DEBUGGER = 0; \
-		int i; \
+		size_t i; \
 		for (i = 0; i < CPU->numComponents; ++i) { \
 			if (CPU->components[i]->id == ARM_DEBUGGER_ID) { \
 				DEBUGGER = (struct ARMDebugger*) cpu->components[i]; \