From 056e5276a2d485c0989e5d24ee77a99e581a3d15 Mon Sep 17 00:00:00 2001
From: Zihao Yu <yuzihao@ict.ac.cn>
Date: Wed, 8 May 2019 00:00:31 +0800
Subject: [PATCH] cpu,inv: rename logo -> isa_logo

---
 src/cpu/inv.c          | 4 ++--
 src/isa/mips32/logo.c  | 2 +-
 src/isa/riscv32/logo.c | 2 +-
 src/isa/x86/logo.c     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cpu/inv.c b/src/cpu/inv.c
index e4729891..057a2745 100644
--- a/src/cpu/inv.c
+++ b/src/cpu/inv.c
@@ -1,12 +1,12 @@
 #include "common.h"
 
 void display_inv_msg(vaddr_t pc) {
-  extern char logo [];
+  extern char isa_logo[];
   printf("There are two cases which will trigger this unexpected exception:\n"
       "1. The instruction at PC = 0x%08x is not implemented.\n"
       "2. Something is implemented incorrectly.\n", pc);
   printf("Find this PC(0x%08x) in the disassembling result to distinguish which case it is.\n\n", pc);
   printf("\33[1;31mIf it is the first case, see\n%s\nfor more details.\n\nIf it is the second case, remember:\n"
       "* The machine is always right!\n"
-      "* Every line of untested code is always wrong!\33[0m\n\n", logo);
+      "* Every line of untested code is always wrong!\33[0m\n\n", isa_logo);
 }
diff --git a/src/isa/mips32/logo.c b/src/isa/mips32/logo.c
index 969aef97..3d9c56a5 100644
--- a/src/isa/mips32/logo.c
+++ b/src/isa/mips32/logo.c
@@ -12,7 +12,7 @@
 
 */
 
-unsigned char logo[] = {
+unsigned char isa_logo[] = {
   0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
   0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
   0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x20,
diff --git a/src/isa/riscv32/logo.c b/src/isa/riscv32/logo.c
index e9454ea2..3ea54c23 100644
--- a/src/isa/riscv32/logo.c
+++ b/src/isa/riscv32/logo.c
@@ -10,7 +10,7 @@
 
 */
 
-unsigned char logo[] = {
+unsigned char isa_logo[] = {
   0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x20, 0x20, 0x20, 0x20,
   0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
   0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x20,
diff --git a/src/isa/x86/logo.c b/src/isa/x86/logo.c
index b3b693e5..764675a1 100644
--- a/src/isa/x86/logo.c
+++ b/src/isa/x86/logo.c
@@ -10,7 +10,7 @@
 
 */
 
-unsigned char logo[] = {
+unsigned char isa_logo[] = {
   0x20, 0x5f, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x5f, 0x5f,
   0x5f, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x5f,
   0x5f, 0x20, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-- 
GitLab