From 2e8dab904d0b86199c6b93e3cdeca7335275c12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Dobrovoljc?= <gasper.dobrovoljc1@gmail.com>
Date: Wed, 8 Nov 2023 15:18:50 +0100
Subject: [PATCH] Vaja 03 popravki

---
 sprotne_naloge/naloga_03/naloga_03.txt   |  79 ++++++++++++++++++
 sprotne_naloge/naloga_03/vaja_01.s       |   4 +-
 sprotne_naloge/naloga_03/vaja_02.s       |   4 +-
 sprotne_naloge/naloga_03/vaja_03_32bit.s |   2 +-
 sprotne_naloge/naloga_04/naloga_04.txt   | 102 +++++++++++++++++++++++
 5 files changed, 187 insertions(+), 4 deletions(-)
 create mode 100644 sprotne_naloge/naloga_03/naloga_03.txt
 create mode 100644 sprotne_naloge/naloga_04/naloga_04.txt

diff --git a/sprotne_naloge/naloga_03/naloga_03.txt b/sprotne_naloge/naloga_03/naloga_03.txt
new file mode 100644
index 0000000..2f4920b
--- /dev/null
+++ b/sprotne_naloge/naloga_03/naloga_03.txt
@@ -0,0 +1,79 @@
+1. mov	R1, #128 @ se prevede v 0xe3a01080, R1 = 0x80, PC = 0x4
+
+2. 
+.text
+.org	0x20
+@spremenljivke
+
+stev1: 	.word	0x12345678
+stev2: 	.byte	128
+		    .align
+stev3:	.hword	0xF123
+
+.align
+.global _start
+_start:
+@program
+
+	adr r0, stev1
+	ldr r1, [r0]
+	
+	adr r0, stev2
+	ldr r1, [r0]
+	
+	adr r0, stev3
+	ldr r1, [r0]
+
+3. 
+32-bit
+
+.text
+.org	0x20
+
+stev1:	.word		0x04030201
+stev2:	.space  4
+
+.global _start
+_start:
+	
+	adr r0, stev1
+	ldr r1, [r0]
+	
+	adr r0, stev2
+	str r1, [r0]
+
+16-bit
+
+.text
+.org	0x20
+
+STEV1:	.hword	0x0201
+STEV2:	.space  2
+
+.global _start
+_start:
+	
+	adr r0, STEV1
+	ldr r1, [r0]
+	
+	adr r0, STEV2
+	strh r1, [r0]
+
+8-bit
+
+.text
+.org	0x20
+
+stev1:	.byte	0x01
+stev2:	.space  1
+.align
+
+.global _start
+_start:
+	
+	adr r0, stev1
+	ldr r1, [r0]
+	
+	adr r0, stev2
+	strb r1, [r0]
+	
\ No newline at end of file
diff --git a/sprotne_naloge/naloga_03/vaja_01.s b/sprotne_naloge/naloga_03/vaja_01.s
index cc5b689..2b0ecee 100644
--- a/sprotne_naloge/naloga_03/vaja_01.s
+++ b/sprotne_naloge/naloga_03/vaja_01.s
@@ -1,2 +1,4 @@
 
-mov	R1, #128 @ se prevede v 0xe3a01080
\ No newline at end of file
+mov	R1, #128 @ se prevede v 0xe3a01080
+R1 80
+PC 4
diff --git a/sprotne_naloge/naloga_03/vaja_02.s b/sprotne_naloge/naloga_03/vaja_02.s
index 796dd39..9867987 100644
--- a/sprotne_naloge/naloga_03/vaja_02.s
+++ b/sprotne_naloge/naloga_03/vaja_02.s
@@ -3,9 +3,9 @@
 @spremenljivke
 
 stev1: 	.word	0x12345678
-STEV2: 	.byte	128
+stev2: 	.byte	128
 		    .align
-STEV3:	.hword	0xF123
+stev3:	.hword	0xF123
 
 .align
 .global _start
diff --git a/sprotne_naloge/naloga_03/vaja_03_32bit.s b/sprotne_naloge/naloga_03/vaja_03_32bit.s
index aa9f3de..4fa7697 100644
--- a/sprotne_naloge/naloga_03/vaja_03_32bit.s
+++ b/sprotne_naloge/naloga_03/vaja_03_32bit.s
@@ -1,7 +1,7 @@
 .text
 .org	0x20
 
-stev1:	.word	0x04030201
+stev1:	.word		0x04030201
 stev2:	.space  4
 
 .global _start
diff --git a/sprotne_naloge/naloga_04/naloga_04.txt b/sprotne_naloge/naloga_04/naloga_04.txt
new file mode 100644
index 0000000..8d57d75
--- /dev/null
+++ b/sprotne_naloge/naloga_04/naloga_04.txt
@@ -0,0 +1,102 @@
+1. vaja
+
+.text
+.org 	0x20
+stev1:	.word	0x00000001
+stev2:	.word	0x00000002
+
+.global _start
+_start:
+	
+	adr		r0, stev1
+	
+	ldrh	r1, [r0]
+	ldrh 	r2, [r0, #4]
+	
+	str		r2, [r0]
+	str		r1, [r0, #4]
+
+
+2. vaja
+
+.text
+.org 	0x20
+		
+tabela:	.space  5
+		
+.align
+
+.global _start
+_start:
+
+	adr		r0, tabela
+	
+	mov		r1, #0xffffffff
+	
+	str		r1, [r0]
+	strb	r1, [r0, #4]
+
+
+3. vaja
+
+.text
+.org 	0x20
+	
+tabela:	.space	6
+	
+.align
+
+.global _start
+_start:
+
+	adr		r0, tabela
+	
+	ldr		r1, =0x04030201
+	str		r1, [r0]
+	
+	ldrh	r1, =0x0605
+	str		r1, [r0, #4]
+
+	@ zamenjaj 1. <-> 6.
+	ldrb	r1, [r0]
+	ldrb	r2, [r0, #5]
+	strb	r2, [r0]
+	strb	r1, [r0, #5]
+	
+	@ zamenjaj 2. <-> 5.
+	ldrb	r1, [r0, #1]
+	ldrb	r2, [r0, #4]
+	strb	r2, [r0, #1]
+	strb	r1, [r0, #4]
+		
+	@ zamenjaj 3. <-> 4.
+	ldrb	r1, [r0, #2]
+	ldrb	r2, [r0, #3]
+	strb	r2, [r0, #2]
+	strb	r1, [r0, #3]
+
+
+4. vaja
+
+.text
+.org 	0x20
+	
+stev1: .word	0x01020304
+	
+.align
+
+.global _start
+_start:
+
+	adr		r0, stev1
+	
+	ldrb	r1, [r0]
+	ldrb	r2, [r0, #3]
+	strb	r2, [r0]
+	strb	r1, [r0, #3]
+		
+	ldrb	r1, [r0, #1]
+	ldrb	r2, [r0, #2]
+	strb	r2, [r0, #1]
+	strb	r1, [r0, #2]
+	
\ No newline at end of file