diff options
| author | Max <mparisi@stevens.edu> | 2020-09-16 13:27:01 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-09-16 13:27:01 -0400 |
| commit | 7186cb8a4161764b8b51a4917cb9040a53f42142 (patch) | |
| tree | 9e651e8d9791f5000a48f002568facf73bcf8cd8 /src | |
| parent | 319dd22af1f7b3d8ba47cdd67dd18a3bd8e01ed2 (diff) | |
ArrayNew, Free, Length, Nth and Append. Labeling and updates to heaaders
Diffstat (limited to 'src')
| -rw-r--r-- | src/darray.c | 150 | ||||
| -rw-r--r-- | src/hashtable.c | 9 |
2 files changed, 155 insertions, 4 deletions
diff --git a/src/darray.c b/src/darray.c new file mode 100644 index 0000000..c8c4c7a --- /dev/null +++ b/src/darray.c @@ -0,0 +1,150 @@ +#if 0
+==ArrayNew 8035a460 80335db8 9c
+==ArrayFree 8035a4fc 80335e54 94
+==ArrayLength 8035a590 80025100 8
+==ArrayNth 8035a598 80335ef0 30
+==ArrayAppend 8035a5c8 80335f20 124
+ArrayInsertSorted 8035a6ec 80336044 180
+ArrayRemoveAt 8035a86c 803361c4 ac
+ArrayDeleteAt 8035a918 80336270 f0
+ArrayReplaceAt 8035aa08 80336360 b8
+# ArraySort 80336418 18
+ArraySearch 8035aad8 80336430 198
+ArrayMapBackwards 8035ac70 803365c8 9c
+ArrayMapBackwards2 8035ad0c 80336664 a4
+ArrayClear 8035adb0 80336708 104
+#endif
+
+DArray *ArrayNew(u32 p1, s32 p2, s32 p3)
+{
+ DArray *darray = gsimalloc(sizeof(DArray)); // r31
+ if (p2 == 0)
+ p2 = 8; // r29
+ darray->size = 0;
+ darray->capacity = p2;
+ darray->elementSz = p1;
+ darray->growAmount = p2;
+ darray->unk10 = p3;
+ if (p2 != 0) {
+ darray->buf = gsimalloc(p2 * darray->elementSz);
+ } else {
+ darray->buf = NULL;
+ }
+ return darray;
+}
+
+void ArrayFree(DArray *p1)
+{
+ for (s32 i = 0; i < p1->size; i++) {
+ func f = p1->unk10;
+ if (p1->unk10) {
+ if (i < 0 || i >= p1->size) {
+ f(NULL);
+ } else {
+ f(&p1->buf[i * p1->elementSz]);
+ }
+ }
+ }
+ gsifree(p1->buf);
+ gsifree(p1);
+}
+
+s32 ArrayLength(DArray *p1)
+{
+ return p1->size;
+}
+
+void *ArrayNth(DArray *p1, s32 p2)
+{
+ if (p2 < 0 || p2 >= p1->size)
+ return NULL;
+ return &p1->buf[i * p1->elementSz];
+}
+
+// params in r29, r30
+void ArrayAppend(DArray *p1, void *elem)
+{
+ if (p1) {
+ const s32 origSize = p1->size; // r31
+ if (origSize == p1->capacity) {
+ s32 newCap = p1->capacity + p1->growAmount;
+ p1->capacity = newCap;
+ p1->buf = gsirealloc(p1->buf, newCap * p1->elementSz);
+ }
+ s32 newSize = p1->size + 1; // r5
+ s32 decNewSize = newSize - 1;
+ p1->size = newSize;
+ void *r3, *r4;
+ // TODO: this whole condition could be an inlined func
+ if (origSize < decNewSize) {
+ // TODO: inlined function calls to ArrayNth
+ s32 incOrigSize = origSize + 1;
+ if (incOrigSize < 0 || incOrigSize >= newSize) {
+ r3 = 0;
+ } else {
+ r3 = &p1->buf[p1->elementSz * incOrigSize];
+ }
+ // fb8
+ if (origSize < 0 || origSize >= newSize) {
+ r4 = 0;
+ } else {
+ r4 = &p1->buf[p1->elementSz * origSize];
+ }
+ memmove(r3, r4, (decNewSize - origSize) * p1->elementSz);
+ }
+ // 5ff0
+ if (origSize < 0 || origSize >= p1->size) {
+ r3 = 0;
+ } else {
+ r3 = &p1->buf[p1->elementSz * origSize];
+ }
+ memcpy(r3, elem, p1->elementSz);
+ }
+}
+
+ArrayInsertSorted()
+{
+
+}
+
+ArrayRemoveAt()
+{
+
+}
+
+ArrayDeleteAt()
+{
+
+}
+
+ArrayReplaceAt()
+{
+
+}
+
+ArraySort()
+{
+
+}
+
+ArraySearch()
+{
+
+}
+
+ArrayMapBackwards()
+{
+
+}
+
+ArrayMapBackwards2()
+{
+
+}
+
+ArrayClear()
+{
+
+}
+
+
diff --git a/src/hashtable.c b/src/hashtable.c index ed880c8..b717ffe 100644 --- a/src/hashtable.c +++ b/src/hashtable.c @@ -1,15 +1,16 @@ #include "types.h"
+#include "nonport.h"
#include "hashtable.h"
-HashTable *TableNew(s32 p1, s32 p2, HashFunction hf, s32 p4, s32 p5)
+HashTable *TableNew(u32 p1, s32 p2, HashFunction hf, s32 p4, s32 p5)
{
return TableNew2(p1, p2, 4, hf, p4, p5);
}
-HashTable *TableNew2(s32 p1, s32 size, s32 p3, HashFunction hf, s32 p5, s32 p6)
+HashTable *TableNew2(u32 p1, s32 size, s32 p3, HashFunction hf, s32 p5, s32 p6)
{
- HashTable *table = (HashTable *)gsimalloc(sizeof(HashTable));
- table->chains = (DArray **)gsimalloc(size * sizeof(DArray *));
+ HashTable *table = gsimalloc(sizeof(HashTable));
+ table->chains = gsimalloc(size * sizeof(DArray *));
for (s32 i = 0; i < size; i++) {
table->chains[i] = (DArray *)ArrayNew(p1, p3, p6);
}
|