Changeset 3344 in CLRX


Ignore:
Timestamp:
Sep 8, 2017, 8:17:46 PM (15 months ago)
Author:
matszpk
Message:

CLRadeonExtender: Asm: Fixes after killing lines.

Location:
CLRadeonExtender/trunk/amdasm
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • CLRadeonExtender/trunk/amdasm/AsmAmdCL2Format.cpp

    r3341 r3344  
    631631    if (asmr.currentKernel!=ASMKERN_GLOBAL && asmr.currentKernel!=ASMKERN_INNER &&
    632632        asmr.sections[asmr.currentSection].type != AsmSectionType::CONFIG)
    633         PSEUDOOP_RETURN_BY_ERROR("Illegal place of configuration pseudo-op");
     633        PSEUDOOP_RETURN_BY_ERROR("Illegal place of configuration pseudo-op")
    634634    if (handler.getDriverVersion() < 191205)
    635635        PSEUDOOP_RETURN_BY_ERROR("Sampler allowed only for new binary format")
  • CLRadeonExtender/trunk/amdasm/AsmGalliumFormat.cpp

    r3341 r3344  
    10081008                if (targetAlign==0 || targetAlign != (1ULL<<(63-CLZ64(targetAlign))))
    10091009                    ASM_NOTGOOD_BY_ERROR(targetAlignPlace,
    1010                                     "Target alignment is not power of 2");
     1010                                    "Target alignment is not power of 2")
    10111011            }
    10121012            else
  • CLRadeonExtender/trunk/amdasm/AsmPseudoOps.cpp

    r3341 r3344  
    720720    asmr.initializeOutputFormat();
    721721    if (!asmr.isWriteableSection())
    722         PSEUDOOP_RETURN_BY_ERROR("Writing data into non-writeable section is illegal");
     722        PSEUDOOP_RETURN_BY_ERROR("Writing data into non-writeable section is illegal")
    723723    skipSpacesToEnd(linePtr, end);
    724724    if (linePtr == end)
     
    10151015    if (!asmr.isAddressableSection())
    10161016        PSEUDOOP_RETURN_BY_ERROR("Change output counter inside non-addressable "
    1017                     "section is illegal");
     1017                    "section is illegal")
    10181018   
    10191019    skipSpacesToEnd(linePtr, end);
     
    16011601    if (asmr.macroMap.find(macroName) != asmr.macroMap.end())
    16021602        ASM_NOTGOOD_BY_ERROR(macroNamePlace, (std::string("Macro '") + macroName.c_str() +
    1603                 "' is already defined").c_str());
     1603                "' is already defined").c_str())
    16041604   
    16051605    {
     
    17951795    bool good = true;
    17961796    if (macroName.empty())
    1797         ASM_RETURN_BY_ERROR(macroNamePlace, "Expected macro name")
     1797        ASM_NOTGOOD_BY_ERROR(macroNamePlace, "Expected macro name")
    17981798    if (!good || !checkGarbagesAtEnd(asmr, linePtr))
    17991799        return;
  • CLRadeonExtender/trunk/amdasm/Assembler.cpp

    r3340 r3344  
    765765    }
    766766    if (linePtr == end)
    767         ASM_FAIL_BY_ERROR(startPlace, "Unterminated string");
     767        ASM_FAIL_BY_ERROR(startPlace, "Unterminated string")
    768768    linePtr++;
    769769    return true;
     
    781781            ASM_FAIL_BY_ERROR(startPlace, "Unterminated character literal")
    782782        if (*linePtr == '\'')
    783             ASM_FAIL_BY_ERROR(startPlace, "Empty character literal");
     783            ASM_FAIL_BY_ERROR(startPlace, "Empty character literal")
    784784       
    785785        if (*linePtr != '\\')
     
    14841484            ASM_FAIL_BY_ERROR(string, clauseType == AsmClauseType::ELSEIF ?
    14851485                        "No '.if' before '.elseif' inside macro" :
    1486                         "No '.if' before '.aelse' inside macro")
     1486                        "No '.if' before '.else' inside macro")
    14871487        case AsmClauseType::REPEAT:
    14881488            ASM_FAIL_BY_ERROR(string, clauseType == AsmClauseType::ELSEIF ?
  • CLRadeonExtender/trunk/amdasm/GCNAssembler.cpp

    r3342 r3344  
    944944                else
    945945                    ASM_NOTGOOD_BY_ERROR1(goodCnt = good, funcNamePlace,
    946                                     "Expected vmcnt, lgkmcnt or expcnt");
     946                                    "Expected vmcnt, lgkmcnt or expcnt")
    947947               
    948948                skipSpacesToEnd(linePtr, end);
     
    27712771            if (linePtr==end || *linePtr!='[')
    27722772                ASM_NOTGOOD_BY_ERROR1(modGood = good, modPlace,
    2773                                 "Expected '[' before format");
     2773                                "Expected '[' before format")
    27742774            if (modGood)
    27752775            {
     
    28082808                        else
    28092809                            ASM_NOTGOOD_BY_ERROR1(modGood = good, fmtPlace,
    2810                                         "Unknown data/number format");
     2810                                        "Unknown data/number format")
    28112811                    }
    28122812                }
     
    38193819            if (sectionId != ASMSECT_ABS)
    38203820                GCN_FAIL_BY_ERROR(sourcePos,
    3821                         "Relative value is illegal in immediate expressions");
     3821                        "Relative value is illegal in immediate expressions")
    38223822            sectionData[offset] = (sectionData[offset]&0x3f) | ((value<<6)&0xff);
    38233823            sectionData[offset+1] = (sectionData[offset+1]&0xe0) | ((value>>2)&0x1f);
     
    38353835            if (sectionId != ASMSECT_ABS)
    38363836                GCN_FAIL_BY_ERROR(sourcePos,
    3837                         "Relative value is illegal in offset expressions");
     3837                        "Relative value is illegal in offset expressions")
    38383838            sectionData[offset] = value;
    38393839            sectionData[offset+1] = (sectionData[offset+1]&0xe0) |
Note: See TracChangeset for help on using the changeset viewer.