From b2f14229e3286657642bb6191ca6e34685bf6ce1 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Sun, 18 Dec 2022 21:32:10 +0100
Subject: [PATCH] Move anal.v850 to arch ##arch

---
 dist/plugins-cfg/plugins.def.cfg                  | 2 +-
 dist/plugins-cfg/plugins.mingw.cfg                | 2 +-
 dist/plugins-cfg/plugins.nocs.cfg                 | 2 +-
 dist/plugins-cfg/plugins.nogpl.cfg                | 2 +-
 dist/plugins-cfg/plugins.termux.cfg               | 2 +-
 libr/{anal => arch}/p/v850.mk                     | 0
 libr/{anal/arch => arch/p}/v850/opc.inc           | 0
 libr/{anal/p/anal_v850.c => arch/p/v850/plugin.c} | 0
 libr/{anal/arch => arch/p}/v850/v850dis.c         | 0
 libr/{anal/arch => arch/p}/v850/v850dis.h         | 0
 libr/{anal/arch => arch/p}/v850/v850e0.c          | 0
 libr/{anal/arch => arch/p}/v850/v850e0.h          | 0
 libr/include/r_anal.h                             | 1 -
 libr/include/r_arch.h                             | 1 +
 14 files changed, 6 insertions(+), 6 deletions(-)
 rename libr/{anal => arch}/p/v850.mk (100%)
 rename libr/{anal/arch => arch/p}/v850/opc.inc (100%)
 rename libr/{anal/p/anal_v850.c => arch/p/v850/plugin.c} (100%)
 rename libr/{anal/arch => arch/p}/v850/v850dis.c (100%)
 rename libr/{anal/arch => arch/p}/v850/v850dis.h (100%)
 rename libr/{anal/arch => arch/p}/v850/v850e0.c (100%)
 rename libr/{anal/arch => arch/p}/v850/v850e0.h (100%)

diff --git a/dist/plugins-cfg/plugins.def.cfg b/dist/plugins-cfg/plugins.def.cfg
index 610e40d49a..c3786d0600 100644
--- a/dist/plugins-cfg/plugins.def.cfg
+++ b/dist/plugins-cfg/plugins.def.cfg
@@ -52,7 +52,7 @@ anal.sparc_cs
 anal.sparc_gnu
 anal.tms320
 anal.tricore
-anal.v850
+arch.v850
 anal.vax
 anal.wasm
 anal.ws
diff --git a/dist/plugins-cfg/plugins.mingw.cfg b/dist/plugins-cfg/plugins.mingw.cfg
index b75cd9ad05..2ce758d1d3 100644
--- a/dist/plugins-cfg/plugins.mingw.cfg
+++ b/dist/plugins-cfg/plugins.mingw.cfg
@@ -39,7 +39,7 @@ anal.s390_cs
 anal.s390_gnu
 anal.tms320
 anal.tricore
-anal.v850
+arch.v850
 anal.ws
 arch.xap
 anal.x86_cs
diff --git a/dist/plugins-cfg/plugins.nocs.cfg b/dist/plugins-cfg/plugins.nocs.cfg
index ba2b5e99fc..d5d0a60a15 100644
--- a/dist/plugins-cfg/plugins.nocs.cfg
+++ b/dist/plugins-cfg/plugins.nocs.cfg
@@ -31,7 +31,7 @@ anal.lm32
 arch.sh
 anal.sparc_gnu
 anal.tricore
-anal.v850
+arch.v850
 anal.ws
 arch.xap
 anal.z80
diff --git a/dist/plugins-cfg/plugins.nogpl.cfg b/dist/plugins-cfg/plugins.nogpl.cfg
index 08d29b3360..18be12ee6a 100644
--- a/dist/plugins-cfg/plugins.nogpl.cfg
+++ b/dist/plugins-cfg/plugins.nogpl.cfg
@@ -18,7 +18,7 @@ anal.ppc_cs
 anal.sparc_cs
 anal.s390_cs
 anal.tms320
-anal.v850
+arch.v850
 anal.ws
 anal.x86_cs
 anal.xcore_cs
diff --git a/dist/plugins-cfg/plugins.termux.cfg b/dist/plugins-cfg/plugins.termux.cfg
index b6f13afdff..039cfe616b 100644
--- a/dist/plugins-cfg/plugins.termux.cfg
+++ b/dist/plugins-cfg/plugins.termux.cfg
@@ -18,7 +18,7 @@ anal.s390_gnu
 anal.s390_cs
 anal.sparc_cs
 anal.sparc_gnu
-anal.v850
+arch.v850
 anal.x86_cs
 anal.xcore_cs
 anal.z80
diff --git a/libr/anal/p/v850.mk b/libr/arch/p/v850.mk
similarity index 100%
rename from libr/anal/p/v850.mk
rename to libr/arch/p/v850.mk
diff --git a/libr/anal/arch/v850/opc.inc b/libr/arch/p/v850/opc.inc
similarity index 100%
rename from libr/anal/arch/v850/opc.inc
rename to libr/arch/p/v850/opc.inc
diff --git a/libr/anal/p/anal_v850.c b/libr/arch/p/v850/plugin.c
similarity index 100%
rename from libr/anal/p/anal_v850.c
rename to libr/arch/p/v850/plugin.c
diff --git a/libr/anal/arch/v850/v850dis.c b/libr/arch/p/v850/v850dis.c
similarity index 100%
rename from libr/anal/arch/v850/v850dis.c
rename to libr/arch/p/v850/v850dis.c
diff --git a/libr/anal/arch/v850/v850dis.h b/libr/arch/p/v850/v850dis.h
similarity index 100%
rename from libr/anal/arch/v850/v850dis.h
rename to libr/arch/p/v850/v850dis.h
diff --git a/libr/anal/arch/v850/v850e0.c b/libr/arch/p/v850/v850e0.c
similarity index 100%
rename from libr/anal/arch/v850/v850e0.c
rename to libr/arch/p/v850/v850e0.c
diff --git a/libr/anal/arch/v850/v850e0.h b/libr/arch/p/v850/v850e0.h
similarity index 100%
rename from libr/anal/arch/v850/v850e0.h
rename to libr/arch/p/v850/v850e0.h
diff --git a/libr/include/r_anal.h b/libr/include/r_anal.h
index cd06f4b76d..938dbb6235 100644
--- a/libr/include/r_anal.h
+++ b/libr/include/r_anal.h
@@ -1685,7 +1685,6 @@ extern RAnalPlugin r_anal_plugin_s390_cs;
 extern RAnalPlugin r_anal_plugin_s390_gnu;
 extern RAnalPlugin r_anal_plugin_tms320;
 extern RAnalPlugin r_anal_plugin_tricore;
-extern RAnalPlugin r_anal_plugin_v850;
 extern RAnalPlugin r_anal_plugin_vax;
 extern RAnalPlugin r_anal_plugin_wasm;
 extern RAnalPlugin r_anal_plugin_ws;
diff --git a/libr/include/r_arch.h b/libr/include/r_arch.h
index 347d69a192..cb507cc67a 100644
--- a/libr/include/r_arch.h
+++ b/libr/include/r_arch.h
@@ -259,6 +259,7 @@ extern RArchPlugin r_arch_plugin_x86_nasm;
 extern RArchPlugin r_arch_plugin_snes;
 extern RArchPlugin r_arch_plugin_6502;
 extern RArchPlugin r_arch_plugin_xap;
+extern RArchPlugin r_arch_plugin_v850;
 
 #ifdef __cplusplus
 }