Dynamic lists fixes and additions

Added new String functions

See merge request spexeah/asuro!30

.gitlab-ci.yml

@@ -1,25 +1,23 @@
 stages:
-  - Generate Stub and Versions
+  - Compile Versions
-  - Generate Version Files
   - Compile Sources
   - Link
-  - Generate ISO
-  - Generate Sources List
   - Generate Documentation
+  - Deploy
 
-compile_stub:
+cache:
-  stage: Generate Stub and Versions
+  - key: ${CI_COMMIT_REF_SLUG}
-  script: 
-    - chmod +x ./compile_stub.sh
-    - ./compile_stub.sh
-  artifacts:
     paths:
-      - lib/stub.o
+      - lib/*.o
+      - bin/kernel.bin
+      - doc
 
-vergen:
+before_script:
-  stage: Generate Stub and Versions
+  - chmod +x *.sh
-  script: 
+
-    - chmod +x ./compile_vergen.sh
+versions:
+  stage: Compile Versions
+  script:
     - ./compile_vergen.sh
   artifacts:
     paths:
@@ -29,71 +27,47 @@ vergen:
 compile_sources:
   stage: Compile Sources
   script:
-    - chmod +x ./compile_sources.sh
+    - rm -f lib/*.so
     - ./compile_sources.sh
-  artifacts:
-    paths:
-      - lib/*.o
-  dependencies:
-    - compile_stub
-    - vergen
   needs:
-    - vergen
+    - versions
-    - compile_stub
 
 link:
   stage: Link
   script:
-    - chmod +x ./compile_link.sh
+    - ./compile_stub.sh
     - ./compile_link.sh
-  artifacts:
-    paths:
-      - bin/kernel.bin
-  dependencies:
-    - compile_sources
   needs:
+    - versions
     - compile_sources
 
 isogen:
-  stage: Generate ISO
+  stage: Deploy
   script:
-    - chmod +x ./compile_isogen.sh
     - ./compile_isogen.sh
-    - chmod +x ./compile_sumgen.sh
     - ./compile_sumgen.sh
   artifacts:
     paths:
       - ./Asuro.iso
       - ./release/checksum.svg
-  dependencies:
-    - link
   needs:
     - link
 
-sourcelist:
-  stage: Generate Sources List
-  script:
-    - chmod +x ./compile_sourcelist.sh
-    - ./compile_sourcelist.sh
-  artifacts:
-    paths:
-      - ./sources.list
-  dependencies:
-    - vergen
-  needs:
-    - vergen
-
 docgen:
   stage: Generate Documentation
+  only:
+    - master
+    - develop
   script:
-    - chmod +x ./compile_docs.sh
+    - ./compile_sourcelist.sh
     - ./compile_docs.sh
+    # Remove comments when we want to use gitlab pages.
+    #- cp doc public
+  allow_failure: true
   artifacts:
     paths:
-      - ./doc/*
+      - doc
-  dependencies:
+      #- public/*
-    - vergen
+      #- ./sources.list
-    - sourcelist
   needs:
-    - vergen
+    - versions
-    - sourcelist

Dockerfile

@@ -2,18 +2,22 @@ FROM ubuntu:latest
 
 VOLUME ["/code"]
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386
-RUN apt-get update
+RUN apt-get update && apt-get install -y \
-RUN apt-get install nasm curl make:i386 binutils:i386 xorriso grub-pc-bin dos2unix -y
+	curl dos2unix wget git make nasm binutils:i386 xorriso grub-pc-bin && \
-RUN apt-get clean
+	apt-get clean my room
-RUN curl https://sourceforge.net/projects/freepascal/files/Linux/2.6.4/fpc-2.6.4.i386-linux.tar/download --output fpc.tar -L && \
-	tar -xf fpc.tar
 
-WORKDIR ./fpc-2.6.4.i386-linux
+SHELL ["/bin/bash", "-c"]
-RUN ./install.sh
+ARG FPC_VERSION=2.6.4
+RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSION/fpc-$FPC_VERSION.i386-linux.tar/download | tar -xf - && \
+	pushd fpc-$FPC_VERSION.i386-linux && ./install.sh && popd && \
+	rm -rf fpc-$FPC_VERSION.i386-linux
 
 COPY compile.sh /compile.sh
-RUN mkdir /code
+ADD https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver /usr/bin/semver
+RUN mkdir /code && chmod +x /usr/bin/semver
 WORKDIR /code
 RUN find . -type f -print0 | xargs -0 dos2unix
-ENTRYPOINT ["/bin/bash", "/compile.sh"]
+ENTRYPOINT ["/bin/bash", "-c"]
+CMD ["/compile.sh"]

compile.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 ERRCOUNT=0
 echo " "
 echo "======================="
@@ -7,49 +7,32 @@ echo "Asuro Compilation"
 echo " "
 
 #Compile Stub.asm
-./compile_stub.sh
+rm lib/*
-if [ $? -ne 0 ]
+
-then
+runOrFail() {
-	echo "Failed to compile stub!"
+	local binary=$1
-	ERRCOUNT=$((ERRCOUNT+1))	
+	local errorText=$2
-else
+	if $binary; then
-	echo "Success."
+		echo "Success."
-fi
+	else
+		echo "$errorText"
+		ERRCOUNT=$((ERRCOUNT+1))
+	fi
+}
+
+runOrFail $(pwd)/compile_stub.sh "Failed to compile stub!"
 
 #Generate .pas with versioning headers.
-./compile_vergen.sh
+runOrFail $(pwd)/compile_vergen.sh "Versions failed to compile"
 
 #Compile all .pas sources
-./compile_sources.sh
+runOrFail $(pwd)/compile_sources.sh "Failed to compile FPC Sources!"
-if [ $? -ne 0 ]
-then
-	echo " "
-	echo "Failed to compile FPC Sources!"
-	ERRCOUNT=$((ERRCOUNT+1))	
-else
-	echo " "
-	echo "Success."
-fi
 
 #Link into a binary.
-./compile_link.sh
+runOrFail $(pwd)/compile_link.sh "Failed linking!"
-if [ $? -ne 0 ]
-then
-	echo "Failed linking!"
-	ERRCOUNT=$((ERRCOUNT+1))
-else
-	echo "Success."
-fi
 
 #Generate an ISO with GRUB as the Bootloader.
-./compile_isogen.sh
+runOrFail ./compile_isogen.sh "Failed to create ISO!"
-if [ $? -ne 0 ]
-then
-	echo "Failed to create ISO!"
-	ERRCOUNT=$((ERRCOUNT+1))
-else
-	echo "Success."
-fi
 
 #Call generate final artifacts based on failure or success of the above.
 if [ "$ERRCOUNT" -ne "0" ]
@@ -59,4 +42,4 @@ else
 	./compile_finish.sh "success"
 fi
 
-cd ..
+cd ..

compile_checksum.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo > checksums.md5
 for directory in $(find src/ -maxdepth 10 -type d); do
 	for filename in $directory/*.pas; do

compile_docs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "
@@ -14,5 +14,4 @@ echo "Removing old docs"
 rm -rf ./doc/*
 echo "Generating Docs..."
 ./pasdoc/bin/pasdoc -N "Asuro" -T "Asuro OS Documentation" -O "html" -E ./doc/ -S sources.list --use-tipue-search
-echo "Docgen finished."
+echo "Docgen finished."
-exit 0

compile_finish.sh

@@ -1,8 +1,8 @@
-#/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "
-if [ "$1" == "failed" ]
+if [[ "$1" == "failed" ]]
 then
 	echo "Errors Occurred, please review."
 	wget -q https://img.shields.io/badge/build-failed-red.svg -O release/build.svg 2>/dev/null

compile_isogen.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "

compile_link.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "

compile_sourcelist.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "

compile_sources.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "

compile_stub.sh

@@ -1,8 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "
 echo "Compiling Stub..."
 echo " "
-rm lib/*
 nasm -f elf src/stub/stub.asm -o lib/stub.o

compile_sumgen.sh

@@ -1,4 +1,4 @@
-#/bin/sh
+#!/usr/bin/env bash
 echo " "
 echo "======================="
 echo " "

compile_vergen.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -e
 echo " "
 echo "======================="
 echo " "
@@ -8,60 +9,67 @@ chmod +x ./compile_checksum.sh
 ./compile_checksum.sh
 outfile="src/include/asuro.pas"
 file="version"
-while IFS=: read -r line;do
+{
-	major=$(echo $line | awk '{print $1}')
+	# this script requires semver tool
-	minor=$(echo $line | awk '{print $2}')
+	wget -q https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver -O bin/semver && chmod +x bin/semver
-	sub=$(echo $line | awk '{print $3}')
+	export PATH="$(pwd)/bin:$PATH"
-	release=$(echo $line | awk '{print $4}')
+}
-done <"$file"
+tagref=$(git describe --tags)
+revision=$(git rev-parse --short=8 HEAD)
+major=$(semver get major $tagref)
+minor=$(semver get minor $tagref)
+sub=$(semver get patch $tagref)
+version=$(semver get release $tagref)
+release=$(semver get prerel $tagref)
+build=$(semver get build $tagref)
 linecount=$(./loc.sh | awk '{print $1}')
 sourcecount=$(find src -type f | wc -l)
 drivercount=$(find src/driver -type f | wc -l)
-revision=$(git rev-list --all --count)
 fpcversion=$(fpc -h | grep -m 1 version | awk '{print $5}')
 makeversion=$(make -v | grep GNU | awk '{print $3}' | grep -v GNU)
 nasmversion=$(nasm -v | awk '{print $3'})
 compiledate=$(date +"%d/%m/%y")
 compiletime=$(date +"%T")
 checksum=$(md5sum checksums.md5 | awk '{print $1}')
-echo "{" > $outfile
+
-echo "   Include->Asuro - Constants generated during pipeline/compilation for use at runtime." >> $outfile
+[[ -n "$release" ]] && version="$version-$release"
-echo "   @author(Autogenerated)" >> $outfile
+cat > $outfile <<EOF
-echo "}" >> $outfile
+unit asuro;
-echo "unit asuro;" >> $outfile
+ 
-echo " " >> $outfile
+interface
-echo "interface" >> $outfile
+ 
-echo " " >> $outfile
+const
-echo "const" >> $outfile
+     VERSION       = '$version';
-echo "     VERSION       = '$major.$minor.$sub-$revision$release'; //The current full version as a string." >> $outfile
+     VERSION_MAJOR = '$major';
-echo "     VERSION_MAJOR = '$major'; // Current major version as a string." >> $outfile
+     VERSION_MINOR = '$minor';
-echo "     VERSION_MINOR = '$minor'; // Current minor version as a string." >> $outfile
+     VERSION_SUB   = '$sub';
-echo "     VERSION_SUB   = '$sub'; // Current sub version as a string." >> $outfile
+     REVISION      = '$revision';
-echo "     REVISION      = '$revision'; // Current revision as a string." >> $outfile
+     RELEASE       = '$release';
-echo "     RELEASE       = '$release'; // Current release as a string." >> $outfile
+     LINE_COUNT    = $linecount;
-echo "     LINE_COUNT    = $linecount; // Project line count as compiled as a string." >> $outfile
+     FILE_COUNT    = $sourcecount;
-echo "     FILE_COUNT    = $sourcecount; // Project line count as compiled as a string." >> $outfile
+     DRIVER_COUNT  = $drivercount;
-echo "     DRIVER_COUNT  = $drivercount; // Number of baked drivers in the current binary." >> $outfile
+     FPC_VERSION   = '$fpcversion';
-echo "     FPC_VERSION   = '$fpcversion'; // Version of the FreePascal Compiler used to compile the current binary." >> $outfile
+     NASM_VERSION  = '$nasmversion';
-echo "     NASM_VERSION  = '$nasmversion'; // Version of the Netwide Assembler used to compile the multiboot stub." >> $outfile
+     MAKE_VERSION  = '$makeversion';
-echo "     MAKE_VERSION  = '$makeversion'; // Version of MAKE used to link the current binary." >> $outfile
+     COMPILE_DATE  = '$compiledate';
-echo "     COMPILE_DATE  = '$compiledate'; // Date in which the current binary was compiled." >> $outfile
+     COMPILE_TIME  = '$compiletime';
-echo "     COMPILE_TIME  = '$compiletime'; // Time in which the current binary was compiled." >> $outfile
+     CHECKSUM      = '$checksum';
-echo "     CHECKSUM      = '$checksum'; // MD5 pseduo-checksum of all of the sourcefiles together." >> $outfile
+ 
-echo " " >> $outfile
+implementation
-echo "implementation" >> $outfile
+ 
-echo " " >> $outfile
+end.
-echo "end." >> $outfile
+EOF
 echo "Generating release info..."
-wget -q https://img.shields.io/badge/version-$major.$minor.$sub--$revision$release-blue.svg -O release/version.svg 2>/dev/null
+set +e # These can fail on branches and such, for now
-wget -q https://img.shields.io/badge/revision-$revision-blue.svg -O release/revision.svg 2>/dev/null
+wget -q https://img.shields.io/badge/version-$major.$minor.$sub--$revision$release-blue.svg -O release/version.svg
-wget -q https://img.shields.io/badge/release-$release-blue.svg -O release/release.svg 2>/dev/null
+wget -q https://img.shields.io/badge/revision-$revision-blue.svg -O release/revision.svg
-wget -q https://img.shields.io/badge/lines-$linecount-blueviolet.svg -O release/lines.svg 2>/dev/null
+wget -q https://img.shields.io/badge/release-$release-blue.svg -O release/release.svg
-wget -q https://img.shields.io/badge/files-$sourcecount-blueviolet.svg -O release/files.svg 2>/dev/null
+wget -q https://img.shields.io/badge/lines-$linecount-blueviolet.svg -O release/lines.svg
-wget -q https://img.shields.io/badge/drivers-$drivercount-blueviolet.svg -O release/drivers.svg 2>/dev/null
+wget -q https://img.shields.io/badge/files-$sourcecount-blueviolet.svg -O release/files.svg
-wget -q https://img.shields.io/badge/FPC_version-$fpcversion-lightgrey.svg -O release/fpcversion.svg 2>/dev/null
+wget -q https://img.shields.io/badge/drivers-$drivercount-blueviolet.svg -O release/drivers.svg
-wget -q https://img.shields.io/badge/NASM_version-$nasmversion-lightgrey.svg -O release/nasmversion.svg 2>/dev/null
+wget -q https://img.shields.io/badge/FPC_version-$fpcversion-lightgrey.svg -O release/fpcversion.svg
-wget -q https://img.shields.io/badge/MAKE_version-$makeversion-lightgrey.svg -O release/makeversion.svg 2>/dev/null
+wget -q https://img.shields.io/badge/NASM_version-$nasmversion-lightgrey.svg -O release/nasmversion.svg
-wget -q https://img.shields.io/badge/release_date-$compiledate-lightgrey.svg -O release/date.svg 2>/dev/null
+wget -q https://img.shields.io/badge/MAKE_version-$makeversion-lightgrey.svg -O release/makeversion.svg
-wget -q https://img.shields.io/badge/fingerprint-$checksum-important.svg -O release/fingerprint.svg 2>/dev/null
+wget -q https://img.shields.io/badge/release_date-$compiledate-lightgrey.svg -O release/date.svg
+wget -q https://img.shields.io/badge/fingerprint-$checksum-important.svg -O release/fingerprint.svg
 echo "Done versioning."

readme.md

@@ -31,11 +31,11 @@ We welcome everyone to give building/breaking/fixing/shooting Asuro a go, feel f
 7. Clone this repository.
 8. Run the following command in the root of the repo to build the docker image:
     ```powershell
-    docker-compose build builder
+    docker compose build builder
     ```
 9. Run the following command to compile Asuro:
     ```powershell
-    docker-compose run builder
+    docker compose run builder
     ```
 10. Create a new virtual machine in Virtualbox and mount the `Asuro.iso` generated in step 9 as a boot image.
 11. Add the virtualbox installation directory to your `%PATH%` environment variable, usually:
@@ -78,4 +78,4 @@ We welcome everyone to give building/breaking/fixing/shooting Asuro a go, feel f
 14. Congratulations! You can now play with Asuro!
 
 ### Gotchas
-- It was noted that Windows builds above `20H2` seem to have issues installing WSL2. We may have to wait for a patch from Microsoft to fix this. Our devs are currently using build `20H2`.
+- It was noted that Windows builds above `20H2` seem to have issues installing WSL2. We may have to wait for a patch from Microsoft to fix this. Our devs are currently using build `20H2`.

src/include/lists.pas

@@ -44,6 +44,19 @@ type
         ElementSize : uint32;
     end;
 
+    { Dynamic List }
+
+    PDList = ^TDList;
+    TDList = record
+        Count : uint32;
+        Data : void;
+        ElementSize : uint32;
+        DataSize : uint32;
+
+    end;
+    
+    { Dynamic List Iterator } 
+
 { String Linked List }
 
 procedure  STRLL_Add(LinkedList : PLinkedListBase; str : pchar);
@@ -66,6 +79,24 @@ function  LL_Get(LinkedList : PLinkedListBase; idx : uint32) : Void;
 procedure LL_Free(LinkedList : PLinkedListBase);
 function  LL_FromString(str : pchar; delimter : char) : PLinkedListBase;
 
+    
+{ Dynamic List }
+
+function  DL_New(ElementSize : uint32) : PDList;
+function  DL_Add(DList : PDList) : Void;
+function  DL_Delete(DList : PDList; idx : uint32) : boolean;
+function  DL_Size(DList : PDList) : uint32;
+function  DL_Set(DList : PDList; idx : uint32; elm : puint32) : boolean;
+function  DL_Get(DList : PDList; idx : uint32) : Void;
+procedure DL_Free(DList : PDList);
+function  DL_IndexOf(DList : PDList; elm : puint32) : uint32;
+function  DL_Contains(DList : PDList; elm : puint32) : boolean;
+function DL_Concat(DList1 : PDList; DList2 : PDList) : PDList;
+
+
+{ Dynamic List Iterator }
+
+
 implementation
 
 uses
@@ -351,4 +382,227 @@ begin
     end;
 end;
 
+{ Dynamic List }
+
+function  DL_New(ElementSize : uint32) : PDList;
+var 
+    DL : PDList;
+begin
+
+    DL := PDList(kalloc(sizeof(DL)));
+    DL^.ElementSize:= ElementSize;
+    DL^.count := 0;
+
+    if ElementSize > 128 then begin
+        DL^.data := kalloc(ElementSize * 4);
+        Dl^.DataSize:= ElementSize * 4;
+
+    end else if ElementSize > 64 then begin
+        DL^.data := kalloc(ElementSize * 8);
+        Dl^.DataSize:= ElementSize * 8;
+        
+    end else if ElementSize > 32 then begin
+        DL^.data := kalloc(ElementSize * 16);
+        Dl^.DataSize:= ElementSize * 16;
+
+    end else if ElementSize > 16 then begin
+      DL^.data := kalloc(ElementSize * 32);
+      Dl^.DataSize:= ElementSize * 32;
+    end else begin
+      DL^.data := kalloc(ElementSize * 64);
+      Dl^.DataSize:= ElementSize * 64;
+    end;
+
+    DL_New := DL;
+end;
+
+function  DL_Add(DList : PDList) : Void;
+var 
+    elm : puint32;
+    tempList : puint32;
+begin
+
+    //check if we need to resize
+    if (DList^.count + 1) * DList^.ElementSize > DList^.DataSize then begin
+        push_trace('lists.DL_Add: Resizing');
+        tempList := DList^.Data;
+        DList^.Data := kalloc(DList^.DataSize * 2);
+        
+        memset(uint32(DList^.Data), 0, DList^.DataSize * 2);
+        memcpy(uint32(tempList), uint32(DList^.Data), DList^.DataSize);
+
+        DList^.DataSize:= DList^.DataSize * 2;
+
+        kfree(void(tempList));
+    end;
+
+    push_trace('lists.DL_Add');
+
+
+    elm := puint32(@puint8(DList^.Data)[(DList^.count * DList^.ElementSize)]);
+    elm^ := 0;
+
+    push_trace('lists.DL_Add: Adding');
+
+    DList^.count := DList^.count + 1;
+
+    DL_Add := elm;
+end;
+
+function  DL_Delete(DList : PDList; idx : uint32) : boolean;
+var 
+    elm : puint32;
+    tempList : puint32;
+begin
+    if idx >= DList^.count then begin
+        DL_Delete := false;
+        exit;
+    end;
+
+    elm := puint32( puint8(DList^.Data) + (idx * DList^.ElementSize));
+    memcpy(uint32( puint8(elm) + DList^.ElementSize), uInt32(elm), (DList^.count - idx) * DList^.ElementSize);
+
+    DList^.count := DList^.count - 1;
+
+    if (DList^.count * DList^.ElementSize) < DList^.DataSize DIV 2 then begin
+        tempList := DList^.Data;
+        DList^.DataSize:= DList^.DataSize DIV 2;
+
+        DList^.Data := kalloc(DList^.DataSize);
+        memcpy(uint32(tempList), uint32(DList^.Data), DList^.DataSize);
+
+        kfree(void(tempList));
+    end;
+
+    DL_Delete := true;
+end;
+
+function  DL_Get(DList : PDList; idx : uint32) : Void;
+var 
+    elm : puint32;
+begin
+    if idx >= DList^.count then begin
+        DL_Get := nil;
+        exit;
+    end;
+
+    elm := puint32(DList^.Data + (idx * DList^.ElementSize));
+    DL_Get := elm;
+end;
+
+function DL_Set(DList : PDList; idx : uint32; elm : puint32) : boolean;
+var
+    tempList : PuInt32;
+    size : uint32;
+begin
+    if idx >= DList^.count then begin
+        DL_Set := false;
+        exit;
+    end;
+
+    //check if we need to resize
+    if (idx + 1) * Dlist^.ElementSize > DList^.DataSize then begin
+                console.writestring('resising thisthinghere');
+
+        size := idx * DList^.ElementSize * 2;
+
+        tempList := DList^.Data;
+        DList^.Data := kalloc(size);
+        memset(uint32(DList^.Data), 0, size);
+
+        memcpy(uint32(tempList), uint32(DList^.Data), DList^.DataSize);
+
+        DList^.DataSize := size;
+
+        kfree(void(tempList));
+    end;
+
+    console.writeString('offset: ');
+    console.writeintln(idx * DList^.ElementSize);
+    memcpy(uint32(elm), uint32( PuInt8(DList^.Data) + (idx * DList^.ElementSize)), DList^.ElementSize);
+
+    //check if count is smaller than idx and if so, increase count
+    if DList^.count < idx then DList^.count := idx;
+
+    DL_Set := true;
+end;
+
+function DL_Size(DList : PDList) : uint32;
+begin
+    DL_Size := DList^.count;
+end;
+
+procedure DL_Free(DList : PDList);
+begin
+    kfree(void(DList^.Data));
+    kfree(void(DList));
+end;
+
+function DL_IndexOf(DList : PDList; elm : puint32) : uint32;
+var 
+    i : uint32;
+    temp : puint32;
+begin
+    for i := 0 to DList^.count - 1 do begin
+        temp := puint32( puint8(DList^.Data) + (i * DList^.ElementSize));
+        if temp = elm then begin
+            DL_IndexOf := i;
+            exit;
+        end;
+    end;
+
+    DL_IndexOf := -1;
+end;
+
+function DL_Contains(DList : PDList; elm : puint32) : boolean;
+var 
+    i : uint32;
+begin
+    i := DL_IndexOf(DList, elm);
+
+    if i = -1 then begin
+        DL_Contains := false;
+        exit;
+    end;
+
+    DL_Contains := true;
+end;
+
+function DL_Concat(DList1 : PDList; DList2 : PDList) : PDList;
+var 
+    i : uint32;
+    temp : puint32;
+begin
+
+    //check element size
+    if DList1^.ElementSize <> DList2^.ElementSize then begin
+        DL_Concat := nil;
+        exit;
+    end;
+
+    //check if we need to resize
+    while true do begin
+          if (DList1^.count + DList2^.count) * DList1^.ElementSize > DList1^.DataSize then begin
+
+            temp := DList1^.Data;
+            DList1^.Data := kalloc(DList1^.DataSize * 2);
+            
+            memset(uint32(DList1^.Data), 0, DList1^.DataSize * 2);
+            memcpy(uint32(temp), uint32(DList1^.Data), DList1^.DataSize);
+
+            DList1^.DataSize:= DList1^.DataSize * 2;
+
+            kfree(void(temp));
+        end else Break;
+    end;
+
+
+    for i := 0 to DList2^.count - 1 do begin
+        temp := DL_Add(DList1);
+        memcpy(uint32(DL_Get(DList2, i)), uint32(temp), DList1^.ElementSize);
+    end;
+
+    DL_Concat := DList1;
+end;
+
 end.

src/include/strings.pas

@@ -16,6 +16,7 @@
 	Include->Strings - String Manipulation.
 	
 	@author(Kieron Morris <kjm@kieronmorris.me>)
+    @author(Aaron Hance <ah@aaronhance.me>)
 }
 unit strings;
 
@@ -33,6 +34,10 @@ function stringCopy(str : pchar) : pchar;
 function stringNew(size : uint32) : pchar;
 function stringSize(str : pchar) : uint32;
 function stringConcat(str1, str2 : pchar) : pchar;
+function stringTrim(str : pchar; length : uint32) : pchar;
+function stringSub(str : pchar; start, size : uint32) : pchar;
+function stringReplace(str, find, replace : pchar) : pchar;
+function stringIndexOf(str, find : pchar) : sint32;
 function stringContains(str : pchar; sub : pchar) : boolean;
 function stringToInt(str : pchar) : uint32;
 function hexStringToInt(str : pchar) : uint32;
@@ -151,6 +156,94 @@ begin
     stringConcat:= result;
 end;
 
+// Trim the string to the specified length.
+function stringTrim(str : pchar; length : uInt32) : pchar;
+var
+    result : pchar;
+begin
+    result:= stringNew(length);
+    memcpy(uint32(str), uint32(result), length);
+    stringTrim:= result;
+end;
+
+// Return a substring of the string.
+function stringSub(str : pchar; start, size : uint32) : pchar;
+var
+    result : pchar;
+begin
+    result:= stringNew(size);
+    memcpy(uint32(str)+start, uint32(result), size);
+    stringSub:= result;
+end;
+
+// Replace first instance of a string with another.
+function stringReplace(str, find, replace : pchar) : pchar;
+var
+    result : pchar;
+    i, j, k : uint32;
+    found : boolean;
+begin
+
+    // Find the first instance of the find string.
+    i:= 0;
+    found:= false;
+    while (i < stringSize(str)) and (not found) do begin
+        if stringEquals(str+i, find) then begin
+            found:= true;
+        end else begin
+            inc(i);
+        end;
+    end;
+
+    // If we found the find string, replace it.
+    if found then begin
+        result:= stringNew(stringSize(str) - stringSize(find) + stringSize(replace));
+        j:= 0;
+        k:= 0;
+        while i < stringSize(str) do begin
+            if stringEquals(str+i, find) then begin
+                memcpy(uint32(replace), uint32(result+j), stringSize(replace));
+                j:= j + stringSize(replace);
+                inc(i, stringSize(find));
+            end else begin
+                result[j]:= str[i];
+                inc(j);
+                inc(i);
+            end;
+        end;
+        stringReplace:= result;
+    end else begin
+        stringReplace:= stringCopy(str);
+    end;
+
+    // Return the result.
+    stringReplace:= result;
+
+end;
+
+
+// Find the index of the first instance of a string.
+function stringIndexOf(str, find : pchar) : sint32;
+var 
+    i : uint32;
+    found : boolean;
+begin
+    i:= 0;
+    found:= false;
+    while (i < stringSize(str)) and (not found) do begin
+        if stringEquals(str+i, find) then begin
+            found:= true;
+        end else begin
+            inc(i);
+        end;
+    end;
+    if found then begin
+        stringIndexOf:= i;
+    end else begin
+        stringIndexOf:= -1;
+    end;
+end;
+
 function stringContains(str : pchar; sub : pchar) : boolean;
 var
     strEnd, subEnd, i, j, count : uint32;