x86: new architecture

Merge 32-bit IA-32 (i386) and 64-bit AMD64 (amd64) code into one common
architecture. The amd64 variant isn't functional yet.

1 files changed, 42 insertions, 0 deletions

diff --git a/arch/x86/machine/asm.h b/arch/x86/machine/asm.h
new file mode 100644
index 0000000..e427b51
--- /dev/null
+++ b/arch/x86/machine/asm.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2011 Richard Braun.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _X86_ASM_H
+#define _X86_ASM_H
+
+#ifdef __ASSEMBLY__
+
+#define TEXT_ALIGN  4
+#define DATA_ALIGN  2
+
+#define ENTRY(x)            \
+.p2align TEXT_ALIGN, 0x90;  \
+.global x;                  \
+.type x, STT_FUNC;          \
+x:
+
+#define DATA(x)         \
+.p2align DATA_ALIGN;    \
+.global x;              \
+.type x, STT_OBJECT;    \
+x:
+
+#define END(x) .size x, . - x;
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _X86_ASM_H */