Skip to content

Commit ccb7351

Browse files
trufaetrufae
authored
Merge RParse into RAsm ##api
1 parent afaf4cb commit ccb7351

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+83
-270
lines changed

‎.github/labeler.yml

-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ RLang:
8383
RMagic:
8484
- libr/magic/**/*
8585

86-
RParse:
87-
- libr/parse/**/*
88-
8986
RReg:
9087
- libr/reg/**/*
9188

‎binr/blob/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ LDFLAGS+=-L../../libr/core -lr_core
3030
LDFLAGS+=-L../../libr/anal -lr_anal
3131
LDFLAGS+=-L../../libr/crypto -lr_crypto
3232
LDFLAGS+=-L../../libr/flag -lr_flag
33-
LDFLAGS+=-L../../libr/parse -lr_parse
3433
LDFLAGS+=-L../../libr/fs -lr_fs
3534
LDFLAGS+=-L../../libr/magic -lr_magic
3635
LDFLAGS+=-L../../libr/syscall -lr_syscall

‎binr/preload/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ISPPC=$(shell uname -m | grep Power)
33
ifeq ($(ISPPC),)
44
BIN=libr2
55
ISLIB=1
6-
BINDEPS=r_core r_parse r_search r_cons r_config
6+
BINDEPS=r_core r_search r_cons r_config
77
BINDEPS+=r_bin r_debug r_anal r_reg r_bp r_io
88
BINDEPS+=r_lang r_asm r_syscall r_hash r_crypto
99
BINDEPS+=r_magic r_socket r_flag r_util r_egg r_fs

‎binr/rabin2/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BIN=rabin2
22
BINDEPS=r_magic r_core r_bin r_egg r_cons r_main
33
BINDEPS+=r_config r_io r_flag r_asm r_util r_bp r_reg
4-
BINDEPS+=r_debug r_lang r_anal r_parse r_crypto
4+
BINDEPS+=r_debug r_lang r_anal r_crypto
55
BINDEPS+=r_search r_syscall r_socket r_fs r_magic
66

77
include ../rules.mk

‎binr/rabin2/meson.build

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ executable('rabin2', 'rabin2.c',
1919
r_reg_dep,
2020
r_syscall_dep,
2121
r_anal_dep,
22-
r_parse_dep,
2322
r_egg_dep,
2423
r_search_dep,
2524
r_crypto_dep,

‎binr/radare2/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BIN=radare2
2-
BINDEPS=r_core r_parse r_search r_cons r_config
2+
BINDEPS=r_core r_search r_cons r_config
33
BINDEPS+=r_bin r_debug r_anal r_reg r_bp r_io r_fs
44
BINDEPS+=r_lang r_asm r_syscall r_main r_util r_esil
55
BINDEPS+=r_magic r_socket r_flag r_egg r_crypto

‎binr/radare2/meson.build

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ radare2_exe = executable('radare2', 'radare2.c',
1919
r_reg_dep,
2020
r_syscall_dep,
2121
r_anal_dep,
22-
r_parse_dep,
2322
r_egg_dep,
2423
r_search_dep,
2524
r_crypto_dep,

‎binr/radiff2/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ BIN=radiff2
22

33
BINDEPS=r_core r_config r_cons r_search r_anal
44
BINDEPS+=r_bin r_debug r_io r_asm r_fs r_crypto
5-
BINDEPS+=r_socket r_flag r_lang r_reg r_bp r_parse
6-
BINDEPS+=r_syscall r_magic r_util r_parse r_egg r_main
5+
BINDEPS+=r_socket r_flag r_lang r_reg r_bp
6+
BINDEPS+=r_syscall r_magic r_util r_egg r_main
77

88
include ../rules.mk
99

‎binr/rafind2/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BIN=rafind2
22

33
BINDEPS=r_search r_io r_asm r_anal r_reg r_cons r_lang r_crypto
4-
BINDEPS+=r_socket r_parse r_util r_syscall r_flag r_main
4+
BINDEPS+=r_socket r_util r_syscall r_flag r_main
55

66
include ../rules.mk
77

‎binr/ragg2/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BIN=ragg2
22
BINDEPS=r_egg r_syscall r_asm
33
BINDEPS+=r_core r_debug r_fs r_config r_bp r_crypto r_cons
4-
BINDEPS+=r_lang r_parse r_anal r_reg r_flag r_crypto
4+
BINDEPS+=r_lang r_anal r_reg r_flag r_crypto
55
BINDEPS+=r_bin r_search r_io r_socket
66
BINDEPS+=r_magic r_util r_main
77

‎binr/rules.mk

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ LINK+=$(LIBR)/flag/libr_flag.a
5252
LINK+=$(LIBR)/syscall/libr_syscall.a
5353
LINK+=$(LIBR)/egg/libr_egg.a
5454
LINK+=$(LIBR)/fs/libr_fs.a
55-
LINK+=$(LIBR)/parse/libr_parse.a
5655
LINK+=$(LIBR)/bin/libr_bin.a
5756
LINK+=$(LIBR)/asm/libr_asm.a
5857
LINK+=$(LIBR)/search/libr_search.a

‎configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ for A in ${ENVWORDS} ; do
856856
SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"
857857
done
858858
SEDFLAGS="${SEDFLAGS}'"
859-
for A in ./config-user.mk libr/include/r_userconf.h pkgcfg/r_io.pc pkgcfg/r_magic.pc pkgcfg/r_esil.pc pkgcfg/r_asm.pc pkgcfg/r_bin.pc pkgcfg/r_anal.pc pkgcfg/r_arch.pc pkgcfg/r_cons.pc pkgcfg/r_core.pc pkgcfg/r_lang.pc pkgcfg/r_socket.pc pkgcfg/r_debug.pc pkgcfg/r_reg.pc pkgcfg/r_config.pc pkgcfg/r_flag.pc pkgcfg/r_syscall.pc pkgcfg/r_util.pc pkgcfg/r_search.pc pkgcfg/r_bp.pc pkgcfg/r_parse.pc pkgcfg/r_fs.pc pkgcfg/r_egg.pc pkgcfg/r_crypto.pc ; do # SUBDIRS
859+
for A in ./config-user.mk libr/include/r_userconf.h pkgcfg/r_io.pc pkgcfg/r_magic.pc pkgcfg/r_esil.pc pkgcfg/r_asm.pc pkgcfg/r_bin.pc pkgcfg/r_anal.pc pkgcfg/r_arch.pc pkgcfg/r_cons.pc pkgcfg/r_core.pc pkgcfg/r_lang.pc pkgcfg/r_socket.pc pkgcfg/r_debug.pc pkgcfg/r_reg.pc pkgcfg/r_config.pc pkgcfg/r_flag.pc pkgcfg/r_syscall.pc pkgcfg/r_util.pc pkgcfg/r_search.pc pkgcfg/r_bp.pc pkgcfg/r_fs.pc pkgcfg/r_egg.pc pkgcfg/r_crypto.pc ; do # SUBDIRS
860860
if [ -f "${VPATH}/${A}.acr" ]; then
861861
SD_TARGET=${A}
862862
else

‎configure.acr

-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ SUBDIRS ./config-user.mk
294294
pkgcfg/r_util.pc
295295
pkgcfg/r_search.pc
296296
pkgcfg/r_bp.pc
297-
pkgcfg/r_parse.pc
298297
pkgcfg/r_fs.pc
299298
pkgcfg/r_egg.pc
300299
pkgcfg/r_crypto.pc

‎dist/npm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"pancake <[email protected]>"
2626
],
2727
"name": "radare2-git",
28-
"version": "5.7.8",
28+
"version": "5.7.9",
2929
"bugs": {
3030
"url": "https://github.com/radareorg/radare2/issues"
3131
},

‎dist/plugins-cfg/plugins.wasi.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
STATIC="
22
arch.x86_nz
33
arch.arm
4-
asm.null
54
anal.dalvik
65
anal.wasm
76
anal.pyc

‎libr/anal/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ EXTRA_TARGETS+=do
44
EXTRA_CLEAN=doclean
55

66
NAME=r_anal
7-
R2DEPS=r_util r_reg r_syscall r_search r_cons r_flag r_crypto r_parse r_arch r_esil
7+
R2DEPS=r_util r_reg r_syscall r_search r_cons r_flag r_crypto r_arch r_esil
88
CFLAGS:=-I.. -I$(LTOP)/asm/arch/include -DR2_PLUGIN_INCORE -Iarch -I$(TOP)/shlr $(CFLAGS)
99

1010
LDFLAGS+=${BN_LIBS}

‎libr/anal/meson.build

-3
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ r_anal = library('r_anal', r_anal_sources,
239239
r_crypto_dep,
240240
r_search_dep,
241241
r_cons_dep,
242-
r_parse_dep,
243242
r_syscall_dep,
244243
r_flag_dep,
245244
java_dep,
@@ -267,7 +266,6 @@ r_anal_static = static_library('r_anal_static', r_anal_sources,
267266
r_crypto_static_dep,
268267
r_esil_static_dep,
269268
r_flag_static_dep,
270-
r_parse_static_dep,
271269
r_reg_static_dep,
272270
r_search_static_dep,
273271
r_syscall_static_dep,
@@ -292,7 +290,6 @@ pkgconfig_mod.generate(r_anal,
292290
'r_reg',
293291
'r_asm',
294292
'r_crypto',
295-
'r_parse',
296293
'r_syscall',
297294
'r_arch',
298295
'r_search',

‎libr/parse/p/parse_arm_pseudo.c ‎libr/arch/p/arm/pseudo.c

File renamed without changes.

‎libr/parse/p/parse_6502_pseudo.c ‎libr/arch/p/pseudo/6502_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_att2intel.c ‎libr/arch/p/pseudo/att2intel.c

File renamed without changes.

‎libr/parse/p/parse_avr_pseudo.c ‎libr/arch/p/pseudo/avr_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_bpf_pseudo.c ‎libr/arch/p/pseudo/bpf_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_chip8_pseudo.c ‎libr/arch/p/pseudo/chip8_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_dalvik_pseudo.c ‎libr/arch/p/pseudo/dalvik_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_evm_pseudo.c ‎libr/arch/p/pseudo/evm_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_m68k_pseudo.c ‎libr/arch/p/pseudo/m68k_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_mips_pseudo.c ‎libr/arch/p/pseudo/mips_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_ppc_pseudo.c ‎libr/arch/p/pseudo/ppc_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_riscv_pseudo.c ‎libr/arch/p/pseudo/riscv_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_sh_pseudo.c ‎libr/arch/p/pseudo/sh_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_tms320_pseudo.c ‎libr/arch/p/pseudo/tms320_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_v850_pseudo.c ‎libr/arch/p/pseudo/v850_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_wasm_pseudo.c ‎libr/arch/p/pseudo/wasm_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_z80_pseudo.c ‎libr/arch/p/pseudo/z80_pseudo.c

File renamed without changes.

‎libr/parse/p/parse_x86_pseudo.c ‎libr/arch/p/x86_nz/pseudo.c

File renamed without changes.

‎libr/asm/Makefile

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include ../../global.mk
22

33
NAME=r_asm
4-
R2DEPS=r_syscall r_lang r_util r_parse
4+
R2DEPS=r_syscall r_lang r_util
55
R2DEPS+=r_flag r_cons r_reg r_arch
66
CFLAGS+=-DR2_PLUGIN_INCORE -Iarch/include -Iarch -I../../shlr
77
CURDIR=p/
@@ -40,11 +40,15 @@ $(EXTRA_CLEAN):
4040
$(MAKE) -C p clean
4141
rm -f `find arch/| grep '\.o$$'`
4242

43-
include ${STATIC_ASM_PLUGINS}
44-
STATIC_OBJS=$(subst ..,p/..,$(subst asm_,p/asm_,$(STATIC_OBJ)))
45-
OBJS=${STATIC_OBJS} asm.o acode.o aop.o aplugs.o
43+
# include ${STATIC_ASM_PLUGINS}
44+
# STATIC_OBJS=$(subst ..,p/..,$(subst asm_,p/asm_,$(STATIC_OBJ)))
45+
46+
include ${STATIC_PARSE_PLUGINS}
47+
STATIC_OBJS=$(subst ..,p/..,$(subst parse_,p/parse_,$(STATIC_OBJ)))
48+
OBJS=${STATIC_OBJS} asm.o acode.o aop.o aplugs.o filter.o parse.o
4649
OBJS+=${SHARED2_OBJ}
4750

51+
4852
ifeq ($(HAVE_GPERF),1)
4953
OBJS+=d/6502.o
5054
OBJS+=d/8051.o

‎libr/asm/asm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static const char *directives[] = {
1818
".else", ".set", ".get", NULL
1919
};
2020

21-
static const RAsmPlugin * const asm_static_plugins[] = { R_ASM_STATIC_PLUGINS };
21+
static const RAsmPlugin * const asm_static_plugins[] = { NULL }; // asm plugins are deprecated
2222

2323
/* pseudo.c - private api */
2424
static int r_asm_pseudo_align(RAsmCode *acode, RAsmOp *op, const char *input) {

‎libr/parse/filter.c ‎libr/asm/filter.c

File renamed without changes.

‎libr/asm/meson.build

+23-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,27 @@ r_asm_sources = [
44
'asm.c',
55
'aop.c',
66
'acode.c',
7+
'parse.c',
8+
'filter.c',
79
'aplugs.c',
8-
'p/asm_null.c',
9-
# '../arch/p/arm/gnu/floatformat.c',
10+
'../arch/p/pseudo/z80_pseudo.c',
11+
'../arch/p/pseudo/wasm_pseudo.c',
12+
'../arch/p/pseudo/v850_pseudo.c',
13+
'../arch/p/pseudo/tms320_pseudo.c',
14+
'../arch/p/pseudo/sh_pseudo.c',
15+
'../arch/p/pseudo/riscv_pseudo.c',
16+
'../arch/p/pseudo/ppc_pseudo.c',
17+
'../arch/p/pseudo/mips_pseudo.c',
18+
'../arch/p/pseudo/m68k_pseudo.c',
19+
'../arch/p/pseudo/evm_pseudo.c',
20+
'../arch/p/pseudo/dalvik_pseudo.c',
21+
'../arch/p/pseudo/chip8_pseudo.c',
22+
'../arch/p/pseudo/bpf_pseudo.c',
23+
'../arch/p/pseudo/6502_pseudo.c',
24+
'../arch/p/arm/pseudo.c',
25+
'../arch/p/x86_nz/pseudo.c',
26+
'../arch/p/pseudo/avr_pseudo.c',
27+
'../arch/p/pseudo/att2intel.c',
1028
]
1129

1230
r_asm_inc = [
@@ -29,9 +47,9 @@ r_asm = library('r_asm', r_asm_sources,
2947
dependencies: [
3048
r_util_dep,
3149
r_syscall_dep,
32-
r_parse_dep,
3350
r_lang_dep,
3451
r_arch_dep,
52+
r_reg_dep,
3553
r_flag_dep,
3654
r_socket_dep,
3755
capstone_dep,
@@ -52,9 +70,9 @@ r_asm_static = static_library('r_asm_static', r_asm_sources,
5270
c_args: library_cflags,
5371
dependencies: [
5472
r_util_static_dep,
73+
r_reg_static_dep,
5574
r_arch_static_dep,
5675
r_syscall_static_dep,
57-
r_parse_static_dep,
5876
r_lang_static_dep,
5977
r_flag_static_dep,
6078
r_socket_static_dep,
@@ -79,8 +97,8 @@ pkgconfig_mod.generate(r_asm,
7997
requires: [
8098
'r_util',
8199
'r_syscall',
82-
'r_parse',
83100
'r_lang',
101+
'r_reg',
84102
'r_flag',
85103
'r_arch',
86104
'r_socket'

‎libr/parse/p/6502_pseudo.mk ‎libr/asm/p/6502_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_6502PSEUDO+=parse_6502_pseudo.o
1+
OBJ_6502PSEUDO+=$(LIBR)/arch/p/pseudo/6502_pseudo.o
22

33
TARGET_6502PSEUDO=parse_6502_pseudo.${EXT_SO}
44
STATIC_OBJ+=${OBJ_6502PSEUDO}

‎libr/parse/p/arm_pseudo.mk ‎libr/asm/p/arm_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_ARMPSEUDO+=parse_arm_pseudo.o
1+
OBJ_ARMPSEUDO+=$(LIBR)/arch/p/arm/pseudo.o
22

33
TARGET_ARMPSEUDO=parse_arm_pseudo.${EXT_SO}
44
STATIC_OBJ+=${OBJ_ARMPSEUDO}

‎libr/asm/p/asm_null.c

-23
This file was deleted.

‎libr/parse/p/att2intel.mk ‎libr/asm/p/att2intel.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_ATTINTEL+=parse_att2intel.o
1+
OBJ_ATTINTEL+=$(LIBR)/arch/p/pseudo/att2intel.o
22

33
TARGET_ATTINTEL=parse_att2intel.${EXT_SO}
44
STATIC_OBJ+=${OBJ_ATTINTEL}

‎libr/parse/p/avr_pseudo.mk ‎libr/asm/p/avr_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_AVRPSEUDO+=parse_avr_pseudo.o
1+
OBJ_AVRPSEUDO+=$(LIBR)/arch/p/pseudo/avr_pseudo.o
22

33
TARGET_AVRPSEUDO=parse_avr_pseudo.${EXT_SO}
44
ALL_TARGETS+=${TARGET_AVRPSEUDO}

‎libr/parse/p/bpf_pseudo.mk ‎libr/asm/p/bpf_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_BPF_PSEUDO+=parse_bpf_pseudo.o
1+
OBJ_BPF_PSEUDO+=$(LIBR)/arch/p/pseudo/bpf_pseudo.o
22

33
TARGET_BPF_PSEUDO=parse_bpf_pseudo.${EXT_SO}
44
STATIC_OBJ+=${OBJ_BPF_PSEUDO}

‎libr/parse/p/chip8_pseudo.mk ‎libr/asm/p/chip8_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_CHIP8PSEUDO+=parse_chip8_pseudo.o
1+
OBJ_CHIP8PSEUDO+=$(LIBR)/arch/p/pseudo/chip8_pseudo.o
22

33
TARGET_CHIP8PSEUDO=parse_chip8_pseudo.${EXT_SO}
44
STATIC_OBJ+=${OBJ_CHIP8PSEUDO}

‎libr/parse/p/dalvik_pseudo.mk ‎libr/asm/p/dalvik_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_DALVIKPSEUDO+=parse_dalvik_pseudo.o
1+
OBJ_DALVIKPSEUDO+=$(LIBR)/arch/p/pseudo/dalvik_pseudo.o
22

33
TARGET_DALVIKPSEUDO=parse_dalvik_pseudo.${EXT_SO}
44
ALL_TARGETS+=${TARGET_DALVIKPSEUDO}

‎libr/parse/p/evm_pseudo.mk ‎libr/asm/p/evm_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_EVM_PSEUDO+=parse_evm_pseudo.o
1+
OBJ_EVM_PSEUDO+=$(LIBR)/arch/p/pseudo/evm_pseudo.o
22

33
TARGET_EVM_PSEUDO=parse_evm_pseudo.${EXT_SO}
44
STATIC_OBJ+=${OBJ_EVM_PSEUDO}

‎libr/parse/p/m68k_pseudo.mk ‎libr/asm/p/m68k_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_M68KPSEUDO+=parse_m68k_pseudo.o
1+
OBJ_M68KPSEUDO+=$(LIBR)/arch/p/pseudo/m68k_pseudo.o
22

33
TARGET_M68KPSEUDO=parse_m68k_pseudo.${EXT_SO}
44
ALL_TARGETS+=${TARGET_M68KPSEUDO}

‎libr/parse/p/mips_pseudo.mk ‎libr/asm/p/mips_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_MIPSPSEUDO+=parse_mips_pseudo.o
1+
OBJ_MIPSPSEUDO+=$(LIBR)/arch/p/pseudo/mips_pseudo.o
22

33
TARGET_MIPSPSEUDO=parse_mips_pseudo.${EXT_SO}
44
ALL_TARGETS+=${TARGET_MIPSPSEUDO}

‎libr/asm/p/null.mk

-10
This file was deleted.

‎libr/parse/p/ppc_pseudo.mk ‎libr/asm/p/ppc_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_PPCPSEUDO+=parse_ppc_pseudo.o
1+
OBJ_PPCPSEUDO+=$(LIBR)/arch/p/pseudo/ppc_pseudo.o
22

33
TARGET_PPCPSEUDO=parse_ppc_pseudo.${EXT_SO}
44
ALL_TARGETS+=${TARGET_PPCPSEUDO}

‎libr/parse/p/riscv_pseudo.mk ‎libr/asm/p/riscv_pseudo.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
OBJ_RISCVPSEUDO+=parse_riscv_pseudo.o
1+
# OBJ_RISCVPSEUDO+=$(LIBR)/arch/p/riscv/pseudo.o
2+
OBJ_RISCVPSEUDO+=$(LIBR)/arch/p/pseudo/riscv_pseudo.o
23

34
TARGET_RISCVPSEUDO=parse_riscv_pseudo.${EXT_SO}
45
ALL_TARGETS+=${TARGET_RISCVPSEUDO}

‎libr/parse/p/sh_pseudo.mk ‎libr/asm/p/sh_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_SHPSEUDO+=parse_sh_pseudo.o
1+
OBJ_SHPSEUDO+=$(LIBR)/arch/p/pseudo/sh_pseudo.o
22

33
TARGET_SHPSEUDO=parse_sh_pseudo.${EXT_SO}
44
ALL_TARGETS+=${TARGET_SHPSEUDO}

‎libr/parse/p/tms320_pseudo.mk ‎libr/asm/p/tms320_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_TMS320PSEUDO+=parse_tms320_pseudo.o
1+
OBJ_TMS320PSEUDO+=$(LIBR)/arch/p/pseudo/tms320_pseudo.o
22

33
TARGET_TMS320PSEUDO=parse_tms320_pseudo.${EXT_SO}
44
ALL_TARGETS+=${TARGET_TMS320PSEUDO}

‎libr/parse/p/v850_pseudo.mk ‎libr/asm/p/v850_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_V850PSEUDO+=parse_v850_pseudo.o
1+
OBJ_V850PSEUDO+=$(LIBR)/arch/p/pseudo/v850_pseudo.o
22

33
TARGET_V850PSEUDO=parse_v850_pseudo.${EXT_SO}
44
ALL_TARGETS+=${TARGET_V850PSEUDO}

‎libr/parse/p/wasm_pseudo.mk ‎libr/asm/p/wasm_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_WASMPSEUDO+=parse_wasm_pseudo.o
1+
OBJ_WASMPSEUDO+=$(LIBR)/arch/p/pseudo/wasm_pseudo.o
22

33
TARGET_WASMPSEUDO=parse_wasm_pseudo.${EXT_SO}
44
STATIC_OBJ+=${OBJ_WASMPSEUDO}

‎libr/parse/p/x86_pseudo.mk ‎libr/asm/p/x86_pseudo.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_X86PSEUDO+=parse_x86_pseudo.o
1+
OBJ_X86PSEUDO+=$(LIBR)/arch/p/x86_nz/pseudo.o
22

33
TARGET_X86PSEUDO=parse_x86_pseudo.${EXT_SO}
44
STATIC_OBJ+=${OBJ_X86PSEUDO}

0 commit comments

Comments
 (0)