diff --git a/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log b/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log index 53f524c..110e2ae 100644 --- a/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log +++ b/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log @@ -859,3 +859,23 @@ arm-none-eabi-size "lab2barnestr.elf" 20:27:00 **** Incremental Build of configuration Debug for project lab2barnestr **** make all make: Nothing to be done for 'all'. +20:37:23 **** Incremental Build of configuration Debug for project lab2barnestr **** +make all +Building file: ../src/main.s +Invoking: MCU GCC Assembler +C:\Users\barnestr\Documents\CE2801\workspace\lab2barnestr\Debug +arm-none-eabi-as -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -g -o "src/main.o" "../src/main.s" +Finished building: ../src/main.s + +Building target: lab2barnestr.elf +Invoking: MCU GCC Linker +arm-none-eabi-gcc -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -T"C:\Users\barnestr\Documents\CE2801\workspace\lab2barnestr\LinkerScript.ld" -Wl,-Map=output.map -Wl,--gc-sections -o "lab2barnestr.elf" @"objects.list" -lm +Finished building target: lab2barnestr.elf + +make --no-print-directory post-build +Generating binary and Printing size information: +arm-none-eabi-objcopy -O binary "lab2barnestr.elf" "lab2barnestr.bin" +arm-none-eabi-size "lab2barnestr.elf" + text data bss dec hex filename + 1104 1080 1092 3276 ccc lab2barnestr.elf + diff --git a/.metadata/.plugins/org.eclipse.cdt.ui/lab2barnestr.build.log b/.metadata/.plugins/org.eclipse.cdt.ui/lab2barnestr.build.log index d94d177..ce4ae6e 100644 --- a/.metadata/.plugins/org.eclipse.cdt.ui/lab2barnestr.build.log +++ b/.metadata/.plugins/org.eclipse.cdt.ui/lab2barnestr.build.log @@ -1,6 +1,23 @@ -20:27:00 **** Incremental Build of configuration Debug for project lab2barnestr **** +20:37:23 **** Incremental Build of configuration Debug for project lab2barnestr **** make all -make: Nothing to be done for 'all'. +Building file: ../src/main.s +Invoking: MCU GCC Assembler +C:\Users\barnestr\Documents\CE2801\workspace\lab2barnestr\Debug +arm-none-eabi-as -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -g -o "src/main.o" "../src/main.s" +Finished building: ../src/main.s + +Building target: lab2barnestr.elf +Invoking: MCU GCC Linker +arm-none-eabi-gcc -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -T"C:\Users\barnestr\Documents\CE2801\workspace\lab2barnestr\LinkerScript.ld" -Wl,-Map=output.map -Wl,--gc-sections -o "lab2barnestr.elf" @"objects.list" -lm +Finished building target: lab2barnestr.elf + +make --no-print-directory post-build +Generating binary and Printing size information: +arm-none-eabi-objcopy -O binary "lab2barnestr.elf" "lab2barnestr.bin" +arm-none-eabi-size "lab2barnestr.elf" + text data bss dec hex filename + 1104 1080 1092 3276 ccc lab2barnestr.elf + -20:27:00 Build Finished (took 255ms) +20:37:24 Build Finished (took 1s.165ms) diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 8ff3131..4c470cc 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,9 +1,9 @@ - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration ModelMigrationProcessor.001 - + @@ -11,9 +11,9 @@ topLevel - - - + + + persp.actionSet:org.eclipse.mylyn.doc.actionSet persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation @@ -70,34 +70,34 @@ persp.actionSet:org.eclipse.debug.ui.profileActionSet persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task - - - - - - + + + + + + - - - - - - - + + + + + + + - + Debug - - - - - + + + + + - + persp.actionSet:org.eclipse.mylyn.doc.actionSet persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation @@ -137,2903 +137,2903 @@ persp.viewSC:org.eclipse.pde.runtime.LogView persp.showIn:org.eclipse.egit.ui.RepositoriesView persp.perspSC:org.eclipse.wst.xml.ui.perspective - - - - - + + + + + org.eclipse.e4.primaryNavigationStack - - + + - - + + - - - - - - - - + + + + + + + + - - - + + + org.eclipse.e4.secondaryNavigationStack - - + + - + org.eclipse.e4.secondaryDataStack Debug active noFocus - - - - - - - - - + + + + + + + + + - - - - + + + + - + View categoryTag:Help - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:Help - - + + org.eclipse.e4.primaryDataStack EditorStack - + Editor org.eclipse.cdt.ui.editor.asm.AsmEditor removeOnHide - + menuContribution:popup popup:#ASMEditorContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#ASMEditorRulerContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + Editor org.eclipse.cdt.ui.editor.asm.AsmEditor removeOnHide - + menuContribution:popup popup:#ASMEditorContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#ASMEditorRulerContext popup:org.eclipse.cdt.ui.editor.asm.AsmEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu - + menuContribution:popup popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu - + - + View categoryTag:C/C++ - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.ui.views.ProblemView popup:org.eclipse.ui.ide.MarkersView - + menuContribution:popup popup:org.eclipse.ui.views.ProblemView popup:org.eclipse.ui.ide.MarkersView - + menuContribution:popup popup:org.eclipse.ui.views.ProblemView popup:org.eclipse.ui.ide.MarkersView - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General active - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTGlobalBuildConsole - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTBuildConsole - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTGlobalBuildConsole - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTBuildConsole - + - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:#ASMOutlineContext - + menuContribution:popup popup:#ASMOutlineContext - + menuContribution:popup popup:#ASMOutlineContext - + - + View categoryTag:Make - + View categoryTag:Mylyn - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.DebugView - + menuContribution:popup popup:org.eclipse.debug.ui.DebugView - + menuContribution:popup popup:org.eclipse.debug.ui.DebugView - + menuContribution:popup popup:org.eclipse.debug.ui.DebugView - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.BreakpointView - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.BreakpointView - + - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.RegisterView - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.VariableView.detail - + menuContribution:popup popup:org.eclipse.debug.ui.ModuleView - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane - + - - + + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - - + + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + toolbarSeparator - + - + Draggable - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Draggable - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - - + + Opaque - + Opaque - + Opaque - + Draggable - + toolbarSeparator - + - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + stretch SHOW_RESTORE_MENU - + Draggable HIDEABLE SHOW_RESTORE_MENU - - + + stretch - + Draggable - + Draggable - - + + TrimStack Draggable - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + platform:cocoa - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + platform:win32 - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + platform:cocoa - + platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + platform:cocoa - + platform:cocoa - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + platform:cocoa - - - - - - + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - + + platform:win32 - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor - + View categoryTag:Debug - + View categoryTag:C/C++ - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Make - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:General - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:Charts - + View categoryTag:Profiling - + View categoryTag:Profiling - + View categoryTag:Profiling - + View categoryTag:Maven - + View categoryTag:Maven - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Oomph - + View categoryTag:Connections - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:General - + View categoryTag:General - + View categoryTag:SVN - + View categoryTag:SVN - + View categoryTag:SVN - + View categoryTag:SVN - + View categoryTag:SVN - + View categoryTag:Team - + View categoryTag:Team - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:XML - + View categoryTag:XML - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lab2barnestr/Debug/lab2barnestr.elf b/lab2barnestr/Debug/lab2barnestr.elf index f51c6cc..fa61ed7 100644 Binary files a/lab2barnestr/Debug/lab2barnestr.elf and b/lab2barnestr/Debug/lab2barnestr.elf differ diff --git a/lab2barnestr/Debug/output.map b/lab2barnestr/Debug/output.map index 5958112..f4bf7e9 100644 --- a/lab2barnestr/Debug/output.map +++ b/lab2barnestr/Debug/output.map @@ -447,9 +447,9 @@ LOAD c:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15 0x0000020c 0x22 c:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7e-m/fpv4-sp/hard/crtn.o OUTPUT(lab2barnestr.elf elf32-littlearm) -.debug_line 0x00000000 0xe7 - .debug_line 0x00000000 0x6e src/main.o - .debug_line 0x0000006e 0x79 startup/startup_stm32.o +.debug_line 0x00000000 0xe5 + .debug_line 0x00000000 0x6c src/main.o + .debug_line 0x0000006c 0x79 startup/startup_stm32.o .debug_info 0x00000000 0xf5 .debug_info 0x00000000 0x76 src/main.o diff --git a/lab2barnestr/Debug/src/main.o b/lab2barnestr/Debug/src/main.o index 2f99933..590dfcc 100644 Binary files a/lab2barnestr/Debug/src/main.o and b/lab2barnestr/Debug/src/main.o differ diff --git a/lab2barnestr/src/main.s b/lab2barnestr/src/main.s index 9f7e7e5..80b339d 100644 --- a/lab2barnestr/src/main.s +++ b/lab2barnestr/src/main.s @@ -18,9 +18,8 @@ .equ RCC_AHB1ENR, 0x30 # GPIOB Enable .equ RCC_GPIOBEN, 1<<1 - # Bit Set Reset Register - .equ GPIOB_BSRR, 0x18 + # Base GPIOB Location .equ GPIOB_BASE, 0x40020400 # GPIO Mode Register .equ GPIO_MODER, 0x00