mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use OPCODE for the RETURN and CONTINUE opcodes.

Browse Source
This commit is contained in:
Reece H. Dunn
2017-01-29 10:29:48 +00:00
parent b937d37e93
commit f2bb482782
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/compiledata.c
+3 -3
View File
@@ -2234,11 +2234,11 @@ int CompilePhoneme(int compile_phoneme)
CompileToneSpec();
break;
case kCONTINUE:
*prog_out++ = i_CONTINUE;
*prog_out++ = OPCODE_CONTINUE;
DecThenCount();
break;
case kRETURN:
*prog_out++ = i_RETURN;
*prog_out++ = OPCODE_RETURN;
DecThenCount();
break;
case kINCLUDE:
@@ -2251,7 +2251,7 @@ int CompilePhoneme(int compile_phoneme)
if (if_level > 0)
error("Missing ENDIF");
if ((prog_out > prog_buf) && (if_stack[0].returned == 0))
*prog_out++ = i_RETURN;
*prog_out++ = OPCODE_RETURN;
break;
}
break;
src/libespeak-ng/synthdata.c
+4 -4
View File
@@ -758,7 +758,7 @@ int NumInstnWords(USHORT *prog)
// This instruction is followed by addWav(), 2 more words
return 4;
}
if (instn2 == i_CONTINUE)
if (instn2 == OPCODE_CONTINUE)
return 3;
return 2;
}
@@ -815,10 +815,10 @@ void InterpretPhoneme(Translator *tr, int control, PHONEME_LIST *plist, PHONEME_
// instructions with no operand
switch (data)
{
case i_RETURN:
case OPCODE_RETURN:
end_flag = 1;
break;
case i_CONTINUE:
case OPCODE_CONTINUE:
break;
default:
InvalidInstn(ph, instn);
@@ -956,7 +956,7 @@ void InterpretPhoneme(Translator *tr, int control, PHONEME_LIST *plist, PHONEME_
param_sc = phdata->sound_param[instn2] = (instn >> 4) & 0xff;
prog++;
if (prog[1] != i_CONTINUE) {
if (prog[1] != OPCODE_CONTINUE) {
if (instn2 < 2) {
// FMT() and WAV() imply Return
end_flag = 1;
src/libespeak-ng/synthesize.h
+3 -3
View File
@@ -268,9 +268,8 @@ typedef struct {
// instructions
#define i_RETURN 0x0001
#define i_CONTINUE 0x0002
#define i_NOT 0x0003
#define OPCODE_RETURN 0x0001
#define OPCODE_CONTINUE 0x0002
// Group 0 instrcutions with 8 bit operand. These values go into bits 8-15 of the instruction
#define i_CHANGE_PHONEME 0x01
@@ -292,6 +291,7 @@ typedef struct {
// conditions and jumps
#define i_CONDITION 0x2000
#define i_OR 0x1000 // added to i_CONDITION
#define i_NOT 0x0003
#define i_JUMP 0x6000
#define i_JUMP_FALSE 0x6800