From a26e370acb45846a2c5791d47be76300f6988998 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Wed, 10 Feb 2021 20:17:23 +0100 Subject: [PATCH] added opdr 2.4 --- Microcontrollers/Microcontrollers.atsln | 16 ++++-- .../opdracht 2.3/Debug/opdracht 2.3.lss | 54 +++++++++---------- .../opdracht 2.3/opdracht 2.3.cproj | 2 +- 3 files changed, 39 insertions(+), 33 deletions(-) diff --git a/Microcontrollers/Microcontrollers.atsln b/Microcontrollers/Microcontrollers.atsln index 1c17037..8366812 100644 --- a/Microcontrollers/Microcontrollers.atsln +++ b/Microcontrollers/Microcontrollers.atsln @@ -17,7 +17,9 @@ Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.1", "opdracht 2. EndProject Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "Opdracht 2.2", "Opdracht 2.2\Opdracht 2.2.cproj", "{7328E66F-4181-4553-9542-DA5CC2A74A4E}" EndProject -Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.3", "opdracht 2.3\opdracht 2.3.cproj", "{C1797223-6702-4148-917B-0CF584136D87}" +Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.3", "opdracht 2.3\opdracht 2.3.cproj", "{E0046CE4-D6F8-435F-9C6E-72E6EB89CCB3}" +EndProject +Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.4", "opdracht 2.4\opdracht 2.4.cproj", "{0FA0C637-5AC0-44F3-999B-49C114B97183}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -53,10 +55,14 @@ Global {7328E66F-4181-4553-9542-DA5CC2A74A4E}.Debug|AVR.Build.0 = Debug|AVR {7328E66F-4181-4553-9542-DA5CC2A74A4E}.Release|AVR.ActiveCfg = Release|AVR {7328E66F-4181-4553-9542-DA5CC2A74A4E}.Release|AVR.Build.0 = Release|AVR - {C1797223-6702-4148-917B-0CF584136D87}.Debug|AVR.ActiveCfg = Debug|AVR - {C1797223-6702-4148-917B-0CF584136D87}.Debug|AVR.Build.0 = Debug|AVR - {C1797223-6702-4148-917B-0CF584136D87}.Release|AVR.ActiveCfg = Release|AVR - {C1797223-6702-4148-917B-0CF584136D87}.Release|AVR.Build.0 = Release|AVR + {E0046CE4-D6F8-435F-9C6E-72E6EB89CCB3}.Debug|AVR.ActiveCfg = Debug|AVR + {E0046CE4-D6F8-435F-9C6E-72E6EB89CCB3}.Debug|AVR.Build.0 = Debug|AVR + {E0046CE4-D6F8-435F-9C6E-72E6EB89CCB3}.Release|AVR.ActiveCfg = Release|AVR + {E0046CE4-D6F8-435F-9C6E-72E6EB89CCB3}.Release|AVR.Build.0 = Release|AVR + {0FA0C637-5AC0-44F3-999B-49C114B97183}.Debug|AVR.ActiveCfg = Debug|AVR + {0FA0C637-5AC0-44F3-999B-49C114B97183}.Debug|AVR.Build.0 = Debug|AVR + {0FA0C637-5AC0-44F3-999B-49C114B97183}.Release|AVR.ActiveCfg = Release|AVR + {0FA0C637-5AC0-44F3-999B-49C114B97183}.Release|AVR.Build.0 = Release|AVR EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Microcontrollers/opdracht 2.3/Debug/opdracht 2.3.lss b/Microcontrollers/opdracht 2.3/Debug/opdracht 2.3.lss index 700c25e..d0ae71f 100644 --- a/Microcontrollers/opdracht 2.3/Debug/opdracht 2.3.lss +++ b/Microcontrollers/opdracht 2.3/Debug/opdracht 2.3.lss @@ -137,7 +137,7 @@ Disassembly of section .text: Disassembly of section .text: 000002fe <__bad_interrupt>: - 2fe: 0c 94 00 00 jmp 0 ; 0x0 <__TEXT_REGION_ORIGIN__> + 2fe: 0c 94 00 00 jmp 0 ; 0x0 <__vectors> Disassembly of section .text.__vector_1: @@ -165,13 +165,13 @@ Disassembly of section .text.__vector_1: 126: df 93 push r29 128: cd b7 in r28, 0x3d ; 61 12a: de b7 in r29, 0x3e ; 62 - 12c: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <__DATA_REGION_ORIGIN__> - 130: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> + 12c: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <_edata> + 130: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <_edata+0x1> 134: 01 96 adiw r24, 0x01 ; 1 - 136: 90 93 01 01 sts 0x0101, r25 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> - 13a: 80 93 00 01 sts 0x0100, r24 ; 0x800100 <__DATA_REGION_ORIGIN__> - 13e: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <__DATA_REGION_ORIGIN__> - 142: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> + 136: 90 93 01 01 sts 0x0101, r25 ; 0x800101 <_edata+0x1> + 13a: 80 93 00 01 sts 0x0100, r24 ; 0x800100 <_edata> + 13e: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <_edata> + 142: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <_edata+0x1> 146: 0e 94 3a 01 call 0x274 ; 0x274 14a: 00 00 nop 14c: df 91 pop r29 @@ -222,13 +222,13 @@ Disassembly of section .text.__vector_2: 1a6: df 93 push r29 1a8: cd b7 in r28, 0x3d ; 61 1aa: de b7 in r29, 0x3e ; 62 - 1ac: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <__DATA_REGION_ORIGIN__> - 1b0: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> + 1ac: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <_edata> + 1b0: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <_edata+0x1> 1b4: 01 97 sbiw r24, 0x01 ; 1 - 1b6: 90 93 01 01 sts 0x0101, r25 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> - 1ba: 80 93 00 01 sts 0x0100, r24 ; 0x800100 <__DATA_REGION_ORIGIN__> - 1be: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <__DATA_REGION_ORIGIN__> - 1c2: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> + 1b6: 90 93 01 01 sts 0x0101, r25 ; 0x800101 <_edata+0x1> + 1ba: 80 93 00 01 sts 0x0100, r24 ; 0x800100 <_edata> + 1be: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <_edata> + 1c2: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <_edata+0x1> 1c6: 0e 94 3a 01 call 0x274 ; 0x274 1ca: 00 00 nop 1cc: df 91 pop r29 @@ -361,20 +361,20 @@ Disassembly of section .text.main: 240: fc 01 movw r30, r24 242: 20 83 st Z, r18 244: 78 94 sei - 246: 80 e3 ldi r24, 0x30 ; 48 - 248: 90 e0 ldi r25, 0x00 ; 0 - 24a: fc 01 movw r30, r24 - 24c: 80 81 ld r24, Z - 24e: 83 30 cpi r24, 0x03 ; 3 - 250: d1 f7 brne .-12 ; 0x246 - 252: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <__DATA_REGION_ORIGIN__> - 256: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> - 25a: 89 2b or r24, r25 - 25c: a1 f3 breq .-24 ; 0x246 - 25e: 10 92 01 01 sts 0x0101, r1 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> - 262: 10 92 00 01 sts 0x0100, r1 ; 0x800100 <__DATA_REGION_ORIGIN__> - 266: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <__DATA_REGION_ORIGIN__> - 26a: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <__DATA_REGION_ORIGIN__+0x1> + 246: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <_edata> + 24a: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <_edata+0x1> + 24e: 89 2b or r24, r25 + 250: d1 f3 breq .-12 ; 0x246 + 252: 80 e3 ldi r24, 0x30 ; 48 + 254: 90 e0 ldi r25, 0x00 ; 0 + 256: fc 01 movw r30, r24 + 258: 80 81 ld r24, Z + 25a: 83 30 cpi r24, 0x03 ; 3 + 25c: a1 f7 brne .-24 ; 0x246 + 25e: 10 92 01 01 sts 0x0101, r1 ; 0x800101 <_edata+0x1> + 262: 10 92 00 01 sts 0x0100, r1 ; 0x800100 <_edata> + 266: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <_edata> + 26a: 90 91 01 01 lds r25, 0x0101 ; 0x800101 <_edata+0x1> 26e: 0e 94 3a 01 call 0x274 ; 0x274 272: e9 cf rjmp .-46 ; 0x246 diff --git a/Microcontrollers/opdracht 2.3/opdracht 2.3.cproj b/Microcontrollers/opdracht 2.3/opdracht 2.3.cproj index 49874c3..93b2609 100644 --- a/Microcontrollers/opdracht 2.3/opdracht 2.3.cproj +++ b/Microcontrollers/opdracht 2.3/opdracht 2.3.cproj @@ -4,7 +4,7 @@ 2.0 7.0 com.microchip.xc8 - {c1797223-6702-4148-917b-0cf584136d87} + {e0046ce4-d6f8-435f-9c6e-72e6eb89ccb3} ATmega128 none Executable