From b8feaea30d1da2afe5c752eeafa2c3690bac3853 Mon Sep 17 00:00:00 2001 From: Andre Guedes Date: Mon, 13 Apr 2015 14:07:59 -0300 Subject: [PATCH] x86: Add helpers.h This patch adds the helpers.h. This file should contain only x86-related helper functions and macros. For now, we define the BIT macro and halt() helpers which will be used in upcoming patches. Additionally, this patch also changes loader.S to call the halt(). --- cpu/x86/Makefile.x86 | 2 +- cpu/x86/helpers.S | 37 +++++++++++++++++++++++++++++++++++++ cpu/x86/helpers.h | 38 ++++++++++++++++++++++++++++++++++++++ platform/galileo/loader.S | 4 +--- 4 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 cpu/x86/helpers.S create mode 100644 cpu/x86/helpers.h diff --git a/cpu/x86/Makefile.x86 b/cpu/x86/Makefile.x86 index b861117a7..dd79ec7d3 100644 --- a/cpu/x86/Makefile.x86 +++ b/cpu/x86/Makefile.x86 @@ -1,6 +1,6 @@ CONTIKI_CPU_DIRS = . -CONTIKI_SOURCEFILES += mtarch.c gdt.c +CONTIKI_SOURCEFILES += mtarch.c gdt.c helpers.S ### Compiler definitions CC = gcc diff --git a/cpu/x86/helpers.S b/cpu/x86/helpers.S new file mode 100644 index 000000000..07e3c7655 --- /dev/null +++ b/cpu/x86/helpers.S @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015, Intel Corporation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +.text + +.global halt +halt: + cli +die: hlt + jmp die diff --git a/cpu/x86/helpers.h b/cpu/x86/helpers.h new file mode 100644 index 000000000..29476e690 --- /dev/null +++ b/cpu/x86/helpers.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2015, Intel Corporation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef HELPERS_H +#define HELPERS_H + +#define BIT(n) (1UL << (n)) + +void halt(void) __attribute__((__noreturn__)); + +#endif /* HELPERS_H */ diff --git a/platform/galileo/loader.S b/platform/galileo/loader.S index 146665d4a..8def35843 100644 --- a/platform/galileo/loader.S +++ b/platform/galileo/loader.S @@ -53,6 +53,4 @@ start: call main /* We're not expected to return from main(). But if we do we halt */ - cli -halt: hlt - jmp halt + call halt