Apple-2-SW/qasm
1
0
Fork 0
mirror of https://github.com/marketideas/qasm.git synced 2024-12-27 15:29:30 +00:00
Code Issues Projects Releases Wiki Activity

work on <>|^ operators to match M32

Browse Source
This commit is contained in:
marketideas 2019-11-19 13:41:27 -08:00
parent 7534c45def
commit 2ebeb0914c
4 changed files with 82 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
asm.cpp
View File

@ -205,7 +205,7 @@ void CLASS::print(uint32_t lineno)
{
pcol += printf(" ");
}
if (isDebug() > 2)
if (isDebug() > 1)
{
pcol += printf("%s ", operand.c_str());
}
@ -1325,40 +1325,56 @@ int CLASS::callOpCode(std::string op, MerlinLine &line)
}
}
switch (line.expr_shift)
if (line.addressmode == syn_imm)
{
case '<':
line.expr_value &= 0xFF;
line.flags |= FLAG_DP;
break;
case '>':
line.expr_value >>= 8;
line.expr_value &= 0xFFFF;
if ((line.syntax & SYNTAX_MERLIN32) == SYNTAX_MERLIN32)
{
//printf("immediate mode\n");
switch (line.expr_shift)
{
case '<':
line.expr_value &= 0xFF;
break;
case '>':
line.expr_value >>= 8;
line.expr_value &= 0xFFFF;
break;
case '^':
line.expr_value = (line.expr_value >> 16) & 0xFFFF;
break;
case '|':
break;
}
}
else
{
switch (line.expr_shift)
{
case '<':
line.flags |= FLAG_DP;
break;
case '>':
if ((syntax & SYNTAX_MERLIN32) == SYNTAX_MERLIN32)
{
// bug in M32 or not, do what it does
line.flags |= FLAG_FORCEABS;
}
else
{
line.flags |= FLAG_FORCELONG;
}
break;
case '|':
line.flags |= FLAG_FORCEABS;
}
break;
case '^':
line.expr_value = (line.expr_value >> 16) & 0xFFFF;
if ((line.syntax & SYNTAX_MERLIN32) == SYNTAX_MERLIN32)
{
line.flags |= FLAG_FORCEABS;
}
break;
case '|':
if ((line.syntax & SYNTAX_MERLIN32) != SYNTAX_MERLIN32)
{
line.flags |= FLAG_FORCELONG;
}
break;
break;
case '^':
//line.flags |= FLAG_FORCELONG;
break;
}
}
if (line.expr_value >= 0x100)
{
line.flags |= FLAG_FORCEABS;
}
auto itr = opcodes.find(Poco::toUpper(op));
if (itr != opcodes.end())
{

37
opcodes.cpp
View File

@ -95,17 +95,15 @@ int CLASS::doEQU(MerlinLine &line, TSymbol &sym)
{
res = -1;
if (syntax==SYNTAX_MERLIN)
{
char buff[32];
sprintf(buff,"$%08X",line.expr_value);
std::string s1=buff;
s = addVariable(line.lable, s1, true);
}
else
{
s = addVariable(line.lable, line.operand, true);
}
#if 1
char buff[32];
sprintf(buff, "$%08X", line.expr_value);
std::string s1 = buff;
s = addVariable(line.lable, s1, true);
#else
// do this if you want to do this more as a #define
s = addVariable(line.lable, line.operand, true);
#endif
if (s != NULL)
{
res = 0;
@ -295,6 +293,19 @@ int CLASS::doAddress(MerlinLine &line, TSymbol &sym)
res = 1 + sym.stype;
if (pass > 0)
{
switch(line.expr_shift)
{
case '^':
line.expr_value=(line.expr_value>>16)&0xFFFF;
break;
case '<':
line.expr_value=(line.expr_value)&0xFF;
break;
case '>':
line.expr_value=(line.expr_value>>8)&0xFFFF;
break;
}
//line.setError(errIncomplete);
setOpcode(line, sym.opcode);
for (i = 0; i < (res - 1); i++)
@ -770,13 +781,13 @@ int CLASS::doBYTE(MerlinLine & line, TSymbol & sym)
{
lastcarry = false;
}
else if (sym.opcode==0xFB) // XCE
else if (sym.opcode == 0xFB) // XCE
{
if (trackrep)
{
if (lastcarry)
{
mx=0x03;
mx = 0x03;
}
}
}

12
psuedo.cpp
View File

@ -839,6 +839,18 @@ int CLASS::ProcessOpcode(T65816Asm &a, MerlinLine &line, TSymbol &opinfo)
a.PC.currentpc = a.PC.orgsave;
line.startpc = a.PC.orgsave;
}
#if 0
// Merlin32 seems to have a bug where ORG seems like it can only be 16 bits
if ((line.syntax&SYNTAX_MERLIN32)==SYNTAX_MERLIN32)
{
// so clear the bank word in all variables
a.PC.orgsave &= 0xFFFF;
a.PC.currentpc&=0xFFFF;
line.startpc &=0xFFFF;
}
#endif
line.flags |= FLAG_FORCEADDRPRINT;
break;
case P_SAV:

7
qasm.ini
View File

@ -4,10 +4,10 @@ logdir=/var/log/mylog
logfile=mylog.log
[option]
debug=1
;==debug must be an integer. Code can use this as a level
;debug=0
nocolor=false
;syntax=merlin32
;debug must be an integer. Code can use this as a level
[application]
timezone=America/Los_Angeles
@ -33,8 +33,7 @@ merlinerrors=true
symcolumns=3
[reformat]
tabs=12; 18; 30
;tabs=0;0;0
tabs=12;18;30