Merge pull request #92 from gtker/main

Convert CONSTANT to anonymous enums

Author: stikonas

aarch64/linux/bootstrap.c

@@ -16,15 +16,30 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0
-// CONSTANT stdout 1
-// CONSTANT stderr 2
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0,
+	stdout = 1,
+	stderr = 2,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 
 int fgetc(FILE* f)

amd64/linux/bootstrap.c

@@ -15,15 +15,30 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0
-// CONSTANT stdout 1
-// CONSTANT stderr 2
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0,
+	stdout = 1,
+	stderr = 2,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 
 int fgetc(FILE* f)

amd64/uefi/bootstrap.c

@@ -15,26 +15,48 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0
-// CONSTANT stdout 1
-// CONSTANT stderr 2
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0,
+	stdout = 1,
+	stderr = 2,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 /* UEFI */
-// CONSTANT PAGE_SIZE 4096
-// CONSTANT PAGE_NUM 16384
-// CONSTANT USER_STACK_SIZE 8388608
-// CONSTANT EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL 1
-// CONSTANT EFI_FILE_MODE_READ 1
-// CONSTANT EFI_FILE_MODE_WRITE 2
-// CONSTANT EFI_FILE_READ_ONLY 1
-// CONSTANT EFI_ALLOCATE_ANY_PAGES 0
-// CONSTANT EFI_LOADER_DATA 2
+enum
+{
+	PAGE_SIZE = 4096,
+	PAGE_NUM = 16384,
+	USER_STACK_SIZE = 8388608,
+};
+
+enum
+{
+	EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL = 1,
+	EFI_FILE_MODE_READ = 1,
+	EFI_FILE_MODE_WRITE = 2,
+	EFI_FILE_READ_ONLY = 1,
+	EFI_ALLOCATE_ANY_PAGES = 0,
+	EFI_LOADER_DATA = 2,
+};
 
 void exit(unsigned value);
 

armv7l/linux/bootstrap.c

@@ -15,15 +15,30 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0
-// CONSTANT stdout 1
-// CONSTANT stderr 2
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0,
+	stdout = 1,
+	stderr = 2,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 
 int fgetc(FILE* f)

knight/linux/bootstrap.c

@@ -15,15 +15,30 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0
-// CONSTANT stdout 1
-// CONSTANT stderr 2
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0,
+	stdout = 1,
+	stderr = 2,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 
 int fgetc(FILE* f)

knight/native/bootstrap.c

@@ -15,15 +15,30 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0x1100
-// CONSTANT stdout 0x1101
-// CONSTANT stderr 0
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0x1100,
+	stdout = 0x1101,
+	stderr = 0,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 
 int fgetc(FILE* f)

riscv32/linux/bootstrap.c

@@ -16,15 +16,30 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0
-// CONSTANT stdout 1
-// CONSTANT stderr 2
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0,
+	stdout = 1,
+	stderr = 2,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 
 int fgetc(FILE* f)

riscv64/linux/bootstrap.c

@@ -16,15 +16,30 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0
-// CONSTANT stdout 1
-// CONSTANT stderr 2
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0,
+	stdout = 1,
+	stderr = 2,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 
 int fgetc(FILE* f)

x86/linux/bootstrap.c

@@ -15,15 +15,30 @@
  * along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT stdin 0
-// CONSTANT stdout 1
-// CONSTANT stderr 2
-// CONSTANT EOF 0xFFFFFFFF
-// CONSTANT NULL 0
-// CONSTANT EXIT_FAILURE 1
-// CONSTANT EXIT_SUCCESS 0
-// CONSTANT TRUE 1
-// CONSTANT FALSE 0
+enum
+{
+	stdin = 0,
+	stdout = 1,
+	stderr = 2,
+};
+
+enum
+{
+	EOF = 0xFFFFFFFF,
+	NULL = 0,
+};
+
+enum
+{
+	EXIT_FAILURE = 1,
+	EXIT_SUCCESS = 0,
+};
+
+enum
+{
+	TRUE = 1,
+	FALSE = 0,
+};
 
 
 int fgetc(FILE* f)