Avans/MIC-KM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	MIC-Week1/.vs/MIC-Week1/v14/.atsuo
#	MIC-Week1/Debug/MIC-Week1.lss
#	MIC-Week2/main.c
This commit is contained in:
kennyboy55
2016-02-17 15:52:14 +01:00
parent 6374952c98 dceb3768d6
commit 4984886521
6 changed files with 169 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MIC-Week1/Debug/MIC-Week1.map
+37 -41
View File
@@ -20,11 +20,14 @@ Discarded input sections
.text.opgave2 0x00000000 0x1a main.o
.text.opgave3 0x00000000 0x1c main.o
.text.opgave4 0x00000000 0x46 main.o
.text.opgave6 0x00000000 0x20 main.o
.text.opgave5 0x00000000 0x8a main.o
.text.charlieplexing
0x00000000 0x54 main.o
.data.pattern 0x00000000 0x4b main.o
.bss.direction
0x00000000 0x2 main.o
.data.speed 0x00000000 0x2 main.o
.bss.count 0x00000000 0x2 main.o
.text 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o)
.data 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o)
.bss 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o)
@@ -191,7 +194,7 @@ END GROUP
.rela.plt
*(.rela.plt)
.text 0x00000000 0x296
.text 0x00000000 0x22a
*(.vectors)
.vectors 0x00000000 0x8c C:/Program Files (x86)/Atmel/Studio/7.0/Packs/Atmel/ATmega_DFP/1.0.91/gcc/dev/atmega128/avr51/crtatmega128.o
0x00000000 __vector_default
@@ -289,15 +292,15 @@ END GROUP
.text.__vector_16
0x00000112 0xda main.o
0x00000112 __vector_16
.text.opgave5 0x000001ec 0x88 main.o
0x000001ec opgave5
.text.main 0x00000274 0x1e main.o
0x00000274 main
0x00000292 . = ALIGN (0x2)
.text.opgave6 0x000001ec 0x1c main.o
0x000001ec opgave6
.text.main 0x00000208 0x1e main.o
0x00000208 main
0x00000226 . = ALIGN (0x2)
*(.fini9)
.fini9 0x00000292 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o)
0x00000292 _exit
0x00000292 exit
.fini9 0x00000226 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o)
0x00000226 _exit
0x00000226 exit
*(.fini9)
*(.fini8)
*(.fini8)
@@ -316,51 +319,44 @@ END GROUP
*(.fini1)
*(.fini1)
*(.fini0)
.fini0 0x00000292 0x4 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o)
.fini0 0x00000226 0x4 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.9.2/avr51\libgcc.a(_exit.o)
*(.fini0)
0x00000296 _etext = .
0x0000022a _etext = .
.data 0x00800100 0x50 load address 0x00000296
.data 0x00800100 0x2 load address 0x0000022a
0x00800100 PROVIDE (__data_start, .)
*(.data)
*(.data*)
.data.pattern 0x00800100 0x4b main.o
0x00800100 pattern
.data.blink 0x0080014b 0x2 main.o
0x0080014b blink
.data.speed 0x0080014d 0x2 main.o
0x0080014d speed
.data.blink 0x00800100 0x2 main.o
0x00800100 blink
*(.rodata)
*(.rodata*)
*(.gnu.linkonce.d*)
0x00800150 . = ALIGN (0x2)
*fill* 0x0080014f 0x1
0x00800150 _edata = .
0x00800150 PROVIDE (__data_end, .)
0x00800102 . = ALIGN (0x2)
0x00800102 _edata = .
0x00800102 PROVIDE (__data_end, .)
.bss 0x00800150 0x8
0x00800150 PROVIDE (__bss_start, .)
.bss 0x00800102 0x6
0x00800102 PROVIDE (__bss_start, .)
*(.bss)
*(.bss*)
.bss.b2 0x00800150 0x2 main.o
0x00800150 b2
.bss.b1 0x00800152 0x2 main.o
0x00800152 b1
.bss.count 0x00800154 0x2 main.o
0x00800154 count
.bss.reset 0x00800156 0x2 main.o
0x00800156 reset
.bss.b2 0x00800102 0x2 main.o
0x00800102 b2
.bss.b1 0x00800104 0x2 main.o
0x00800104 b1
.bss.reset 0x00800106 0x2 main.o
0x00800106 reset
*(COMMON)
0x00800158 PROVIDE (__bss_end, .)
0x00000296 __data_load_start = LOADADDR (.data)
0x000002e6 __data_load_end = (__data_load_start + SIZEOF (.data))
0x00800108 PROVIDE (__bss_end, .)
0x0000022a __data_load_start = LOADADDR (.data)
0x0000022c __data_load_end = (__data_load_start + SIZEOF (.data))
.noinit 0x00800158 0x0
0x00800158 PROVIDE (__noinit_start, .)
.noinit 0x00800108 0x0
0x00800108 PROVIDE (__noinit_start, .)
*(.noinit*)
0x00800158 PROVIDE (__noinit_end, .)
0x00800158 _end = .
0x00800158 PROVIDE (__heap_start, .)
0x00800108 PROVIDE (__noinit_end, .)
0x00800108 _end = .
0x00800108 PROVIDE (__heap_start, .)
.eeprom 0x00810000 0x0
*(.eeprom*)